]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: upgrade to 2.0.0.1
authorJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 05:44:44 +0000 (13:44 +0800)
committerJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 07:20:54 +0000 (15:20 +0800)
Signed-off-by: Joe Jin <joe.jin@oracle.com>
25 files changed:
drivers/net/e1000e/80003es2lan.c
drivers/net/e1000e/80003es2lan.h [new file with mode: 0644]
drivers/net/e1000e/82571.c
drivers/net/e1000e/82571.h [new file with mode: 0644]
drivers/net/e1000e/Makefile
drivers/net/e1000e/defines.h
drivers/net/e1000e/e1000.h
drivers/net/e1000e/ethtool.c
drivers/net/e1000e/hw.h
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/ich8lan.h [new file with mode: 0644]
drivers/net/e1000e/kcompat.c [new file with mode: 0644]
drivers/net/e1000e/kcompat.h [new file with mode: 0644]
drivers/net/e1000e/kcompat_ethtool.c [new file with mode: 0644]
drivers/net/e1000e/mac.c
drivers/net/e1000e/mac.h [new file with mode: 0644]
drivers/net/e1000e/manage.c
drivers/net/e1000e/manage.h [new file with mode: 0644]
drivers/net/e1000e/netdev.c
drivers/net/e1000e/nvm.c
drivers/net/e1000e/nvm.h [new file with mode: 0644]
drivers/net/e1000e/param.c
drivers/net/e1000e/phy.c
drivers/net/e1000e/phy.h [new file with mode: 0644]
drivers/net/e1000e/regs.h [new file with mode: 0644]

index 0c3f1e3106f33f64e952054d96bbd7c0c0064f07..ba8abfcd61812dd8282c2a21de005940eeee2657 100644 (file)
 
 #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 */
+static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw);
+static void e1000_release_phy_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw);
+static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
+                                                 u32 offset, u16 *data);
+static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
+                                                  u32 offset, u16 data);
+static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
+                                      u16 words, u16 *data);
+static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
+                                             u16 *duplex);
+static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw);
+static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
+static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex);
+static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw);
+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 s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw);
+static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
+static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
+static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw);
+static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
 
 /*
  * A table for the GG82563 cable length where the range is defined
  * "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)
+       0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF
+};
 
-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);
+#define GG82563_CABLE_LENGTH_TABLE_SIZE \
+               (sizeof(e1000_gg82563_cable_length_table) / \
+                sizeof(e1000_gg82563_cable_length_table[0]))
 
 /**
  *  e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
@@ -129,17 +92,34 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
        s32 ret_val;
 
        if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type       = e1000_phy_none;
+               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;
+       phy->addr = 1;
+       phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+       phy->reset_delay_us = 100;
+       phy->type = e1000_phy_gg82563;
+
+       phy->ops.acquire = e1000_acquire_phy_80003es2lan;
+       phy->ops.check_polarity = e1000_check_polarity_m88;
+       phy->ops.check_reset_block = e1000e_check_reset_block_generic;
+       phy->ops.commit = e1000e_phy_sw_reset;
+       phy->ops.get_cfg_done = e1000_get_cfg_done_80003es2lan;
+       phy->ops.get_info = e1000e_get_phy_info_m88;
+       phy->ops.release = e1000_release_phy_80003es2lan;
+       phy->ops.reset = e1000e_phy_hw_reset_generic;
+       phy->ops.set_d3_lplu_state = e1000e_set_d3_lplu_state;
+
+       phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan;
+       phy->ops.get_cable_length = e1000_get_cable_length_80003es2lan;
+       phy->ops.read_reg = e1000_read_phy_reg_gg82563_80003es2lan;
+       phy->ops.write_reg = e1000_write_phy_reg_gg82563_80003es2lan;
+
+       phy->ops.cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan;
 
        /* This can only be done after all function pointers are setup. */
        ret_val = e1000e_get_phy_id(hw);
@@ -161,19 +141,19 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
        u32 eecd = er32(EECD);
        u16 size;
 
-       nvm->opcode_bits        = 8;
-       nvm->delay_usec  = 1;
+       nvm->opcode_bits = 8;
+       nvm->delay_usec = 1;
        switch (nvm->override) {
        case e1000_nvm_override_spi_large:
-               nvm->page_size    = 32;
+               nvm->page_size = 32;
                nvm->address_bits = 16;
                break;
        case e1000_nvm_override_spi_small:
-               nvm->page_size    = 8;
+               nvm->page_size = 8;
                nvm->address_bits = 8;
                break;
        default:
-               nvm->page_size    = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
+               nvm->page_size = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
                nvm->address_bits = eecd & E1000_EECD_ADDR_BITS ? 16 : 8;
                break;
        }
@@ -181,7 +161,7 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
        nvm->type = e1000_nvm_eeprom_spi;
 
        size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                         E1000_EECD_SIZE_EX_SHIFT);
+                    E1000_EECD_SIZE_EX_SHIFT);
 
        /*
         * Added to a constant, "size" becomes the left-shift value
@@ -192,7 +172,16 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
        /* EEPROM access above 16k is unsupported */
        if (size > 14)
                size = 14;
-       nvm->word_size  = 1 << size;
+       nvm->word_size = 1 << size;
+
+       /* Function Pointers */
+       nvm->ops.acquire = e1000_acquire_nvm_80003es2lan;
+       nvm->ops.read = e1000e_read_nvm_eerd;
+       nvm->ops.release = e1000_release_nvm_80003es2lan;
+       nvm->ops.update = e1000e_update_nvm_checksum_generic;
+       nvm->ops.valid_led_default = e1000e_valid_led_default;
+       nvm->ops.validate = e1000e_validate_nvm_checksum_generic;
+       nvm->ops.write = e1000_write_nvm_80003es2lan;
 
        return 0;
 }
@@ -228,36 +217,65 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
        /* 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;
+       mac->arc_subsystem_valid = !!(er32(FWSM) & E1000_FWSM_MODE_MASK);
        /* Adaptive IFS not supported */
        mac->adaptive_ifs = false;
 
+       /* Function pointers */
+
+       /* bus type/speed/width */
+       mac->ops.get_bus_info = e1000e_get_bus_info_pcie;
+       /* reset */
+       mac->ops.reset_hw = e1000_reset_hw_80003es2lan;
+       /* hw initialization */
+       mac->ops.init_hw = e1000_init_hw_80003es2lan;
+       /* link setup */
+       mac->ops.setup_link = e1000e_setup_link_generic;
+       /* check management mode */
+       mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
+       /* multicast address update */
+       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
+       /* writing VFTA */
+       mac->ops.write_vfta = e1000_write_vfta_generic;
+       /* clearing VFTA */
+       mac->ops.clear_vfta = e1000_clear_vfta_generic;
+       /* read mac address */
+       mac->ops.read_mac_addr = e1000_read_mac_addr_80003es2lan;
+       /* ID LED init */
+       mac->ops.id_led_init = e1000e_id_led_init_generic;
+       /* 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 = e1000e_cleanup_led_generic;
+       /* turn on/off LED */
+       mac->ops.led_on = e1000e_led_on_generic;
+       mac->ops.led_off = e1000e_led_off_generic;
+       /* clear hardware counters */
+       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan;
+       /* link info */
+       mac->ops.get_link_up_info = e1000_get_link_up_info_80003es2lan;
+
        /* 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)
+/**
+ *  e1000_init_function_pointers_80003es2lan - Init ESB2 func ptrs.
+ *  @hw: pointer to the HW structure
+ *
+ *  Called to initialize all function pointers and parameters.
+ **/
+void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw)
 {
-       struct e1000_hw *hw = &adapter->hw;
-       s32 rc;
-
-       rc = e1000_init_mac_params_80003es2lan(hw);
-       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_init_mac_ops_generic(hw);
+       e1000_init_nvm_ops_generic(hw);
+       hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan;
+       hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan;
+       hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan;
 }
 
 /**
@@ -289,7 +307,7 @@ static void e1000_release_phy_80003es2lan(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register
+ *  e1000_acquire_mac_csr_80003es2lan - Acquire right to access Kumeran register
  *  @hw: pointer to the HW structure
  *
  *  Acquire the semaphore to access the Kumeran interface.
@@ -305,7 +323,7 @@ static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_release_mac_csr_80003es2lan - Release rights to access Kumeran Register
+ *  e1000_release_mac_csr_80003es2lan - Release right to access Kumeran Register
  *  @hw: pointer to the HW structure
  *
  *  Release the semaphore used to access the Kumeran interface
@@ -411,8 +429,10 @@ static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
 {
        u32 swfw_sync;
 
+/* *INDENT-OFF* */
        while (e1000e_get_hw_semaphore(hw) != 0)
                ; /* Empty */
+/* *INDENT-ON* */
 
        swfw_sync = er32(SW_FW_SYNC);
        swfw_sync &= ~mask;
@@ -458,7 +478,7 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                return ret_val;
        }
 
-       if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) {
+       if (hw->dev_spec.e80003es2lan.mdic_wa_enable) {
                /*
                 * The "ready" bit in the MDIC register may be incorrectly set
                 * before the device has completed the "Page Select" MDI
@@ -477,14 +497,14 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                udelay(200);
 
                ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
 
                udelay(200);
        } else {
                ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
        }
 
        e1000_release_phy_80003es2lan(hw);
@@ -529,7 +549,7 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                return ret_val;
        }
 
-       if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) {
+       if (hw->dev_spec.e80003es2lan.mdic_wa_enable) {
                /*
                 * The "ready" bit in the MDIC register may be incorrectly set
                 * before the device has completed the "Page Select" MDI
@@ -548,14 +568,14 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                udelay(200);
 
                ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
+                                                   MAX_PHY_REG_ADDRESS &
+                                                   offset, data);
 
                udelay(200);
        } else {
                ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
+                                                   MAX_PHY_REG_ADDRESS &
+                                                   offset, data);
        }
 
        e1000_release_phy_80003es2lan(hw);
@@ -654,7 +674,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
                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);
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
 
@@ -670,7 +690,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 
                /* Try once more */
                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
        }
@@ -743,14 +763,12 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
        s32 ret_val;
 
        if (hw->phy.media_type == e1000_media_type_copper) {
-               ret_val = e1000e_get_speed_and_duplex_copper(hw,
-                                                                   speed,
-                                                                   duplex);
+               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);
+                                                                  speed,
+                                                                  duplex);
        }
 
        return ret_val;
@@ -766,6 +784,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
 {
        u32 ctrl;
        s32 ret_val;
+       u16 kum_reg_data;
 
        /*
         * Prevent the PCI-E bus from sticking if there is no TLP connection
@@ -791,6 +810,13 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
        ew32(CTRL, ctrl | E1000_CTRL_RST);
        e1000_release_phy_80003es2lan(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);
+
        ret_val = e1000e_get_auto_rd_done(hw);
        if (ret_val)
                /* We don't want to continue accessing MAC registers. */
@@ -820,10 +846,10 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
        e1000_initialize_hw_bits_80003es2lan(hw);
 
        /* Initialize identification LED */
-       ret_val = e1000e_id_led_init(hw);
+       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 */
+       /* This is not fatal and we should not stop init due to this */
 
        /* Disabling VLAN filtering */
        e_dbg("Initializing the IEEE VLAN\n");
@@ -838,7 +864,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
                E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
 
        /* Setup link and flow control */
-       ret_val = e1000e_setup_link(hw);
+       ret_val = mac->ops.setup_link(hw);
 
        /* Disable IBIST slave mode (far-end loopback) */
        e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
@@ -850,13 +876,13 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *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;
+           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;
+           E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
        ew32(TXDCTL(1), reg_data);
 
        /* Enable retransmit on late collisions */
@@ -884,12 +910,12 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
        hw->dev_spec.e80003es2lan.mdic_wa_enable = true;
 
        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET >>
-                                     E1000_KMRNCTRLSTA_OFFSET_SHIFT,
-                                     &i);
+                                                 E1000_KMRNCTRLSTA_OFFSET >>
+                                                 E1000_KMRNCTRLSTA_OFFSET_SHIFT,
+                                                 &i);
        if (!ret_val) {
                if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==
-                    E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
+                   E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
                        hw->dev_spec.e80003es2lan.mdic_wa_enable = false;
        }
 
@@ -926,7 +952,7 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
 
        /* Transmit Arbitration Control 0 */
        reg = er32(TARC(0));
-       reg &= ~(0xF << 27); /* 30:27 */
+       reg &= ~(0xF << 27);    /* 30:27 */
        if (hw->phy.media_type != e1000_media_type_copper)
                reg &= ~(1 << 20);
        ew32(TARC(0), reg);
@@ -938,6 +964,14 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
        else
                reg |= (1 << 28);
        ew32(TARC(1), reg);
+
+       /*
+        * Disable IPv6 extension header parsing because some malformed
+        * IPv6 headers can hang the Rx.
+        */
+       reg = er32(RFCTL);
+       reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+       ew32(RFCTL, reg);
 }
 
 /**
@@ -1016,21 +1050,22 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 
        /* 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);
+                                                  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);
+                                                 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);
+                                                  E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
+                                                  data);
        if (ret_val)
                return ret_val;
 
@@ -1056,7 +1091,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
         * firmware will have already initialized them.  We only initialize
         * them if the HW is not in IAMT mode.
         */
-       if (!e1000e_check_mng_mode(hw)) {
+       if (!hw->mac.ops.check_mng_mode(hw)) {
                /* Enable Electrical Idle on the PHY */
                data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;
                ret_val = e1e_wphy(hw, GG82563_PHY_PWR_MGMT_CTRL, data);
@@ -1113,27 +1148,27 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
         * polling the phy; this fixes erroneous timeouts at 10Mbps.
         */
        ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
-                                                  0xFFFF);
+                                                  0xFFFF);
        if (ret_val)
                return ret_val;
        ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                 &reg_data);
+                                                 &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);
+                                                  reg_data);
        if (ret_val)
                return ret_val;
        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                     &reg_data);
+                                                 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);
+                                                  E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                                  reg_data);
        if (ret_val)
                return ret_val;
 
@@ -1160,7 +1195,7 @@ static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
 
        if (hw->phy.media_type == e1000_media_type_copper) {
                ret_val = e1000e_get_speed_and_duplex_copper(hw, &speed,
-                                                            &duplex);
+                                                            &duplex);
                if (ret_val)
                        return ret_val;
 
@@ -1190,8 +1225,8 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 
        reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
+                                                  E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                                  reg_data);
        if (ret_val)
                return ret_val;
 
@@ -1236,8 +1271,8 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
 
        reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
        ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
+                                                  E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                                  reg_data);
        if (ret_val)
                return ret_val;
 
@@ -1284,7 +1319,7 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
                return ret_val;
 
        kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
+                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
        ew32(KMRNCTRLSTA, kmrnctrlsta);
        e1e_flush();
 
@@ -1319,7 +1354,7 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
                return ret_val;
 
        kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
+                      E1000_KMRNCTRLSTA_OFFSET) | data;
        ew32(KMRNCTRLSTA, kmrnctrlsta);
        e1e_flush();
 
@@ -1410,75 +1445,3 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
        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_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 */
-       .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/80003es2lan.h b/drivers/net/e1000e/80003es2lan.h
new file mode 100644 (file)
index 0000000..0b4b8e9
--- /dev/null
@@ -0,0 +1,97 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_80003ES2LAN_H_
+#define _E1000_80003ES2LAN_H_
+
+#define E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL     0x00
+#define E1000_KMRNCTRLSTA_OFFSET_INB_CTRL      0x02
+#define E1000_KMRNCTRLSTA_OFFSET_HD_CTRL       0x10
+#define E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE        0x1F
+
+#define E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS  0x0008
+#define E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS  0x0800
+#define E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING 0x0010
+
+#define E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT 0x0004
+#define E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT 0x0000
+#define E1000_KMRNCTRLSTA_OPMODE_E_IDLE                0x2000
+
+#define E1000_KMRNCTRLSTA_OPMODE_MASK          0x000C
+#define E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO   0x0004
+
+#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00    /* Gigabit Carry Extend Padding */
+#define DEFAULT_TCTL_EXT_GCEX_80003ES2LAN      0x00010000
+
+#define DEFAULT_TIPG_IPGT_1000_80003ES2LAN     0x8
+#define DEFAULT_TIPG_IPGT_10_100_80003ES2LAN   0x9
+
+/* GG82563 PHY Specific Status Register (Page 0, Register 16 */
+#define GG82563_PSCR_POLARITY_REVERSAL_DISABLE 0x0002  /* 1=Reversal Disabled */
+#define GG82563_PSCR_CROSSOVER_MODE_MASK       0x0060
+#define GG82563_PSCR_CROSSOVER_MODE_MDI                0x0000  /* 00=Manual MDI */
+#define GG82563_PSCR_CROSSOVER_MODE_MDIX       0x0020  /* 01=Manual MDIX */
+#define GG82563_PSCR_CROSSOVER_MODE_AUTO       0x0060  /* 11=Auto crossover */
+
+/* PHY Specific Control Register 2 (Page 0, Register 26) */
+#define GG82563_PSCR2_REVERSE_AUTO_NEG         0x2000  /* 1=Reverse Auto-Nego */
+
+/* MAC Specific Control Register (Page 2, Register 21) */
+/* Tx clock speed for Link Down and 1000BASE-T for the following speeds */
+#define GG82563_MSCR_TX_CLK_MASK               0x0007
+#define GG82563_MSCR_TX_CLK_10MBPS_2_5         0x0004
+#define GG82563_MSCR_TX_CLK_100MBPS_25         0x0005
+#define GG82563_MSCR_TX_CLK_1000MBPS_2_5       0x0006
+#define GG82563_MSCR_TX_CLK_1000MBPS_25                0x0007
+
+#define GG82563_MSCR_ASSERT_CRS_ON_TX          0x0010  /* 1=Assert */
+
+/* DSP Distance Register (Page 5, Register 26) */
+/*
+ * 0 = <50M
+ * 1 = 50-80M
+ * 2 = 80-100M
+ * 3 = 110-140M
+ * 4 = >140M
+ */
+#define GG82563_DSPD_CABLE_LENGTH              0x0007
+
+/* Kumeran Mode Control Register (Page 193, Register 16) */
+#define GG82563_KMCR_PASS_FALSE_CARRIER                0x0800
+
+/* Max number of times Kumeran read/write should be validated */
+#define GG82563_MAX_KMRN_RETRY                 0x5
+
+/* Power Management Control Register (Page 193, Register 20) */
+/* 1=Enable SERDES Electrical Idle */
+#define GG82563_PMCR_ENABLE_ELECTRICAL_IDLE    0x0001
+
+/* In-Band Control Register (Page 194, Register 18) */
+#define GG82563_ICR_DIS_PADDING                        0x0010  /* Disable Padding */
+
+#endif
index 425852b663ba6ab00c760bc0d38180fcbcc69f2b..04cdf5038544b972cb50c70ae68923a4180002a3 100644 (file)
 
 #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 s32 e1000_init_phy_params_82571(struct e1000_hw *hw);
+static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw);
+static s32 e1000_init_mac_params_82571(struct e1000_hw *hw);
+static s32 e1000_acquire_nvm_82571(struct e1000_hw *hw);
+static void e1000_release_nvm_82571(struct e1000_hw *hw);
+static s32 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset,
+                                u16 words, u16 *data);
+static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw);
+static s32 e1000_validate_nvm_checksum_82571(struct e1000_hw *hw);
+static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw);
+static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active);
+static s32 e1000_reset_hw_82571(struct e1000_hw *hw);
+static s32 e1000_init_hw_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 s32 e1000_setup_link_82571(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw);
+static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw);
+static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw);
+static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data);
+static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw);
+static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw);
+static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw);
+static s32 e1000_get_phy_id_82571(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 s32 e1000_get_hw_semaphore_82573(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);
+static void e1000_initialize_hw_bits_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_read_mac_addr_82571(struct e1000_hw *hw);
+static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw);
 
 /**
  *  e1000_init_phy_params_82571 - Init PHY func ptrs.
@@ -95,24 +97,55 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
                return 0;
        }
 
-       phy->addr                        = 1;
-       phy->autoneg_mask                = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us              = 100;
+       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;
+       phy->ops.check_reset_block = e1000e_check_reset_block_generic;
+       phy->ops.reset = e1000e_phy_hw_reset_generic;
+       phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_82571;
+       phy->ops.set_d3_lplu_state = e1000e_set_d3_lplu_state;
+       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;
+               phy->type = e1000_phy_igp_2;
+               phy->ops.get_cfg_done = e1000_get_cfg_done_82571;
+               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;
+               phy->ops.get_cable_length = e1000e_get_cable_length_igp_2;
+               phy->ops.read_reg = e1000e_read_phy_reg_igp;
+               phy->ops.write_reg = e1000e_write_phy_reg_igp;
+               phy->ops.acquire = e1000_get_hw_semaphore_82571;
+               phy->ops.release = e1000_put_hw_semaphore_82571;
                break;
        case e1000_82573:
-               phy->type                = e1000_phy_m88;
+               phy->type = e1000_phy_m88;
+               phy->ops.get_cfg_done = e1000e_get_cfg_done;
+               phy->ops.get_info = e1000e_get_phy_info_m88;
+               phy->ops.check_polarity = e1000_check_polarity_m88;
+               phy->ops.commit = e1000e_phy_sw_reset;
+               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
+               phy->ops.get_cable_length = e1000e_get_cable_length_m88;
+               phy->ops.read_reg = e1000e_read_phy_reg_m88;
+               phy->ops.write_reg = e1000e_write_phy_reg_m88;
+               phy->ops.acquire = e1000_get_hw_semaphore_82571;
+               phy->ops.release = e1000_put_hw_semaphore_82571;
                break;
        case e1000_82574:
        case e1000_82583:
-               phy->type                = e1000_phy_bm;
+               phy->type = e1000_phy_bm;
+               phy->ops.get_cfg_done = e1000e_get_cfg_done;
+               phy->ops.get_info = e1000e_get_phy_info_m88;
+               phy->ops.check_polarity = e1000_check_polarity_m88;
+               phy->ops.commit = e1000e_phy_sw_reset;
+               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
+               phy->ops.get_cable_length = e1000e_get_cable_length_m88;
+               phy->ops.read_reg = e1000e_read_phy_reg_bm2;
+               phy->ops.write_reg = e1000e_write_phy_reg_bm2;
                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;
@@ -203,7 +236,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
        default:
                nvm->type = e1000_nvm_eeprom_spi;
                size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                                 E1000_EECD_SIZE_EX_SHIFT);
+                            E1000_EECD_SIZE_EX_SHIFT);
                /*
                 * Added to a constant, "size" becomes the left-shift value
                 * for setting word_size.
@@ -213,7 +246,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
                /* EEPROM access above 16k is unsupported */
                if (size > 14)
                        size = 14;
-               nvm->word_size  = 1 << size;
+               nvm->word_size = 1 << size;
                break;
        }
 
@@ -225,8 +258,15 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
                nvm->ops.release = e1000_put_hw_semaphore_82574;
                break;
        default:
+               nvm->ops.acquire = e1000_acquire_nvm_82571;
+               nvm->ops.release = e1000_release_nvm_82571;
                break;
        }
+       nvm->ops.read = e1000e_read_nvm_eerd;
+       nvm->ops.update = e1000_update_nvm_checksum_82571;
+       nvm->ops.validate = e1000_validate_nvm_checksum_82571;
+       nvm->ops.valid_led_default = e1000_valid_led_default_82571;
+       nvm->ops.write = e1000_write_nvm_82571;
 
        return 0;
 }
@@ -281,6 +321,35 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
        /* Adaptive IFS supported */
        mac->adaptive_ifs = true;
 
+       /* Function pointers */
+
+       /* bus type/speed/width */
+       mac->ops.get_bus_info = e1000e_get_bus_info_pcie;
+       /* reset */
+       mac->ops.reset_hw = e1000_reset_hw_82571;
+       /* hw initialization */
+       mac->ops.init_hw = e1000_init_hw_82571;
+       /* link setup */
+       mac->ops.setup_link = e1000_setup_link_82571;
+       /* multicast address update */
+       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
+       /* writing VFTA */
+       mac->ops.write_vfta = e1000_write_vfta_generic;
+       /* clearing VFTA */
+       mac->ops.clear_vfta = e1000_clear_vfta_82571;
+       /* read mac address */
+       mac->ops.read_mac_addr = e1000_read_mac_addr_82571;
+       /* ID LED init */
+       mac->ops.id_led_init = e1000e_id_led_init_generic;
+       /* setup LED */
+       mac->ops.setup_led = e1000e_setup_led_generic;
+       /* cleanup LED */
+       mac->ops.cleanup_led = e1000e_cleanup_led_generic;
+       /* turn off LED */
+       mac->ops.led_off = e1000e_led_off_generic;
+       /* clear hardware counters */
+       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_82571;
+
        /* MAC-specific function pointers */
        switch (hw->mac.type) {
        case e1000_82573:
@@ -295,9 +364,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
                 * ARC supported; valid only if manageability features are
                 * enabled.
                 */
-               mac->arc_subsystem_valid =
-                       (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
+               mac->arc_subsystem_valid = !!(er32(FWSM) &
+                                             E1000_FWSM_MODE_MASK);
                break;
        case e1000_82574:
        case e1000_82583:
@@ -357,77 +425,24 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
         * Initialize device specific counter of SMBI acquisition
         * timeouts.
         */
-        hw->dev_spec.e82571.smb_counter = 0;
+       hw->dev_spec.e82571.smb_counter = 0;
 
        return 0;
 }
 
-static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
+/**
+ *  e1000_init_function_pointers_82571 - Init func ptrs.
+ *  @hw: pointer to the HW structure
+ *
+ *  Called to initialize all function pointers and parameters.
+ **/
+void e1000_init_function_pointers_82571(struct e1000_hw *hw)
 {
-       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(hw);
-       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_init_mac_ops_generic(hw);
+       e1000_init_nvm_ops_generic(hw);
+       hw->mac.ops.init_params = e1000_init_mac_params_82571;
+       hw->nvm.ops.init_params = e1000_init_nvm_params_82571;
+       hw->phy.ops.init_params = e1000_init_phy_params_82571;
 }
 
 /**
@@ -554,6 +569,7 @@ static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
        swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
        ew32(SWSM, swsm);
 }
+
 /**
  *  e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
  *  @hw: pointer to the HW structure
@@ -798,7 +814,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
        /* Check for pending operations. */
        for (i = 0; i < E1000_FLASH_UPDATES; i++) {
                usleep_range(1000, 2000);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+               if (!(er32(EECD) & E1000_EECD_FLUPD))
                        break;
        }
 
@@ -822,7 +838,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
 
        for (i = 0; i < E1000_FLASH_UPDATES; i++) {
                usleep_range(1000, 2000);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+               if (!(er32(EECD) & E1000_EECD_FLUPD))
                        break;
        }
 
@@ -880,8 +896,8 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
 
        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;
+                   ((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)
@@ -908,8 +924,7 @@ 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)
+               if (er32(EEMNGCTL) & E1000_NVM_CFG_DONE_PORT_0)
                        break;
                usleep_range(1000, 2000);
                timeout--;
@@ -965,25 +980,25 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
                 * SmartSpeed, so performance is maintained.
                 */
                if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
+                       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);
+                       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);
+                       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);
+                       ret_val = e1e_wphy(hw,
+                                          IGP01E1000_PHY_PORT_CONFIG, data);
                        if (ret_val)
                                return ret_val;
                }
@@ -1118,10 +1133,10 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
        e1000_initialize_hw_bits_82571(hw);
 
        /* Initialize identification LED */
-       ret_val = e1000e_id_led_init(hw);
+       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 */
+       /* This is not fatal and we should not stop init due to this */
 
        /* Disabling VLAN filtering */
        e_dbg("Initializing the IEEE VLAN\n");
@@ -1143,13 +1158,12 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
                E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
 
        /* Setup link and flow control */
-       ret_val = e1000_setup_link_82571(hw);
+       ret_val = mac->ops.setup_link(hw);
 
        /* Set the transmit descriptor write-back policy */
        reg_data = er32(TXDCTL(0));
        reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                  E1000_TXDCTL_FULL_TX_DESC_WB |
-                  E1000_TXDCTL_COUNT_DESC;
+           E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
        ew32(TXDCTL(0), reg_data);
 
        /* ...for both queues. */
@@ -1166,8 +1180,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
        default:
                reg_data = er32(TXDCTL(1));
                reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                          E1000_TXDCTL_FULL_TX_DESC_WB |
-                          E1000_TXDCTL_COUNT_DESC;
+                   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
                ew32(TXDCTL(1), reg_data);
                break;
        }
@@ -1205,7 +1218,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
 
        /* Transmit Arbitration Control 0 */
        reg = er32(TARC(0));
-       reg &= ~(0xF << 27); /* 30:27 */
+       reg &= ~(0xF << 27);    /* 30:27 */
        switch (hw->mac.type) {
        case e1000_82571:
        case e1000_82572:
@@ -1269,18 +1282,26 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                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);
+       }
 
-        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);
-        }
-
+       /*
+        * Disable IPv6 extension header parsing because some malformed
+        * IPv6 headers can hang the Rx.
+        */
+       if (hw->mac.type <= e1000_82573) {
+               reg = er32(RFCTL);
+               reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+               ew32(RFCTL, reg);
+       }
 
        /* PCI-Ex Control Registers */
        switch (hw->mac.type) {
@@ -1334,9 +1355,10 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw)
                         */
                        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);
+                           E1000_VFTA_ENTRY_MASK;
+                       vfta_bit_in_reg =
+                           1 << (hw->mng_cookie.vlan_id &
+                                 E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
                }
                break;
        default:
@@ -1415,7 +1437,7 @@ bool e1000_check_phy_82574(struct e1000_hw *hw)
        ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors);
        if (ret_val)
                return false;
-       if (receive_errors == E1000_RECEIVE_ERROR_MAX)  {
+       if (receive_errors == E1000_RECEIVE_ERROR_MAX) {
                ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt);
                if (ret_val)
                        return false;
@@ -1455,7 +1477,7 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw)
                break;
        }
 
-       return e1000e_setup_link(hw);
+       return e1000e_setup_link_generic(hw);
 }
 
 /**
@@ -1584,7 +1606,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
                         * If the partner code word is null, stop forcing
                         * and restart auto negotiation.
                         */
-                       if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW))  {
+                       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));
@@ -1907,187 +1929,3 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
        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_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_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_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_HAS_SMART_POWER_DOWN
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
-       .flags2                   = FLAG2_CHECK_PHY_HANG
-                                 | FLAG2_DISABLE_ASPM_L0S
-                                 | FLAG2_NO_DISABLE_RX,
-       .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_HAS_SMART_POWER_DOWN
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
-       .flags2                 = FLAG2_DISABLE_ASPM_L0S
-                                 | FLAG2_NO_DISABLE_RX,
-       .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/82571.h b/drivers/net/e1000e/82571.h
new file mode 100644 (file)
index 0000000..1638178
--- /dev/null
@@ -0,0 +1,60 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_82571_H_
+#define _E1000_82571_H_
+
+#define ID_LED_RESERVED_F746   0xF746
+#define ID_LED_DEFAULT_82573   ((ID_LED_DEF1_DEF2 << 12) | \
+                                (ID_LED_OFF1_ON2  <<  8) | \
+                                (ID_LED_DEF1_DEF2 <<  4) | \
+                                (ID_LED_DEF1_DEF2))
+
+#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX        0x08000000
+#define AN_RETRY_COUNT         5       /* Autoneg Retry Count value */
+
+/* Intr Throttling - RW */
+#define E1000_EITR_82574(_n)   (0x000E8 + (0x4 * (_n)))
+
+#define E1000_EIAC_82574       0x000DC /* Ext. Interrupt Auto Clear - RW */
+#define E1000_EIAC_MASK_82574  0x01F00000
+
+/* Manageability Operation Mode mask */
+#define E1000_NVM_INIT_CTRL2_MNGM      0x6000
+
+#define E1000_RXCFGL   0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */
+
+#define E1000_BASE1000T_STATUS         10
+#define E1000_IDLE_ERROR_COUNT_MASK    0xFF
+#define E1000_RECEIVE_ERROR_COUNTER    21
+#define E1000_RECEIVE_ERROR_MAX                0xFFFF
+bool e1000_check_phy_82574(struct e1000_hw *hw);
+bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
+void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state);
+
+#endif
index 591b713245057fc4b2ae2fccf797665090ef972c..37ed9b219cb95d07f319979f142b264d411c99e0 100644 (file)
@@ -32,7 +32,5 @@
 
 obj-$(CONFIG_E1000E) += e1000e.o
 
-e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
-              mac.o manage.o nvm.o phy.o \
-              param.o ethtool.o netdev.o
-
+e1000e-objs := netdev.o ethtool.o param.o 82571.o ich8lan.o 80003es2lan.o \
+               mac.o nvm.o phy.o manage.o kcompat.o
index 1af30b967a4fcd588ba9b62492157c10b6d100db..96d0b583c097a255780521c029e612aee11007c2 100644 (file)
 #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 */
+#define E1000_WUC_APME         0x00000001      /* APM Enable */
+#define E1000_WUC_PME_EN       0x00000002      /* PME Enable */
+#define E1000_WUC_PME_STATUS   0x00000004      /* PME Status */
+#define E1000_WUC_APMPME       0x00000008      /* Assert PME on APM Wakeup */
+#define E1000_WUC_LSCWE                0x00000010      /* Link Status wake up enable */
+#define E1000_WUC_LSCWO                0x00000020      /* Link Status wake up override */
+#define E1000_WUC_SPM          0x80000000      /* Enable SPM */
+#define E1000_WUC_PHY_WAKE     0x00000100      /* if PHY supports wakeup */
+#define E1000_WUC_FLX6_PHY     0x4000  /* Flexible Filter 6 Enable */
+#define E1000_WUC_FLX7_PHY     0x8000  /* Flexible Filter 7 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 */
-#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
+#define E1000_WUFC_LNKC        0x00000001      /* Link Status Change Wakeup Enable */
+#define E1000_WUFC_MAG 0x00000002      /* Magic Packet Wakeup Enable */
+#define E1000_WUFC_EX  0x00000004      /* Directed Exact Wakeup Enable */
+#define E1000_WUFC_MC  0x00000008      /* Directed Multicast Wakeup Enable */
+#define E1000_WUFC_BC  0x00000010      /* Broadcast Wakeup Enable */
+#define E1000_WUFC_ARP 0x00000020      /* ARP Request Packet Wakeup Enable */
+#define E1000_WUFC_IPV4        0x00000040      /* Directed IPv4 Packet Wakeup Enable */
+#define E1000_WUFC_IPV6        0x00000080      /* Directed IPv6 Packet Wakeup Enable */
+#define E1000_WUFC_IGNORE_TCO_PHY 0x00000800   /* Ignore WakeOn TCO packets */
+#define E1000_WUFC_FLX0_PHY    0x00001000      /* Flexible Filter 0 Enable */
+#define E1000_WUFC_FLX1_PHY    0x00002000      /* Flexible Filter 1 Enable */
+#define E1000_WUFC_FLX2_PHY    0x00004000      /* Flexible Filter 2 Enable */
+#define E1000_WUFC_FLX3_PHY    0x00008000      /* Flexible Filter 3 Enable */
+#define E1000_WUFC_FLX4_PHY    0x00000200      /* Flexible Filter 4 Enable */
+#define E1000_WUFC_FLX5_PHY    0x00000400      /* Flexible Filter 5 Enable */
+#define E1000_WUFC_IGNORE_TCO  0x00008000      /* Ignore WakeOn TCO packets */
+#define E1000_WUFC_FLX0                0x00010000      /* Flexible Filter 0 Enable */
+#define E1000_WUFC_FLX1                0x00020000      /* Flexible Filter 1 Enable */
+#define E1000_WUFC_FLX2                0x00040000      /* Flexible Filter 2 Enable */
+#define E1000_WUFC_FLX3                0x00080000      /* Flexible Filter 3 Enable */
+#define E1000_WUFC_FLX4                0x00100000      /* Flexible Filter 4 Enable */
+#define E1000_WUFC_FLX5                0x00200000      /* Flexible Filter 5 Enable */
+#define E1000_WUFC_FLX6                0x00400000      /* Flexible Filter 6 Enable */
+#define E1000_WUFC_FLX7                0x00800000      /* Flexible Filter 7 Enable */
+#define E1000_WUFC_ALL_FILTERS_PHY_4   0x0000F0FF      /* wakeup filters mask */
+#define E1000_WUFC_FLX_OFFSET_PHY      12      /* Flexible Filters bits offset */
+#define E1000_WUFC_FLX_FILTERS_PHY_4   0x0000F000      /* 4 flexible filters mask */
+#define E1000_WUFC_ALL_FILTERS_PHY_6   0x0000F6FF      /* 6 wakeup filters mask */
+#define E1000_WUFC_FLX_FILTERS_PHY_6   0x0000F600      /* 6 flexible filters mask */
+#define E1000_WUFC_ALL_FILTERS         0x000F00FF      /* all wakeup filters mask */
+#define E1000_WUFC_ALL_FILTERS_6       0x003F00FF      /* Mask all 6 wu filters */
+#define E1000_WUFC_ALL_FILTERS_8       0x00FF00FF      /* Mask all 8 wu filters */
+#define E1000_WUFC_FLX_OFFSET          16      /* Flexible Filters bits offset */
+#define E1000_WUFC_FLX_FILTERS         0x000F0000      /* 4 flexible filters mask */
+#define E1000_WUFC_FLX_FILTERS_6       0x003F0000      /* 6 flexible filters mask */
+#define E1000_WUFC_FLX_FILTERS_8       0x00FF0000      /* 8 flexible filters mask */
 
 /* Wake Up Status */
-#define E1000_WUS_LNKC         E1000_WUFC_LNKC
-#define E1000_WUS_MAG          E1000_WUFC_MAG
-#define E1000_WUS_EX           E1000_WUFC_EX
-#define E1000_WUS_MC           E1000_WUFC_MC
-#define E1000_WUS_BC           E1000_WUFC_BC
+#define E1000_WUS_LNKC         E1000_WUFC_LNKC
+#define E1000_WUS_MAG          E1000_WUFC_MAG
+#define E1000_WUS_EX           E1000_WUFC_EX
+#define E1000_WUS_MC           E1000_WUFC_MC
+#define E1000_WUS_BC           E1000_WUFC_BC
+#define E1000_WUS_ARP          E1000_WUFC_ARP
+#define E1000_WUS_IPV4         E1000_WUFC_IPV4
+#define E1000_WUS_IPV6         E1000_WUFC_IPV6
+#define E1000_WUS_FLX0_PHY     E1000_WUFC_FLX0_PHY
+#define E1000_WUS_FLX1_PHY     E1000_WUFC_FLX1_PHY
+#define E1000_WUS_FLX2_PHY     E1000_WUFC_FLX2_PHY
+#define E1000_WUS_FLX3_PHY     E1000_WUFC_FLX3_PHY
+#define E1000_WUS_FLX_FILTERS_PHY_4    E1000_WUFC_FLX_FILTERS_PHY_4
+#define E1000_WUS_FLX0         E1000_WUFC_FLX0
+#define E1000_WUS_FLX1         E1000_WUFC_FLX1
+#define E1000_WUS_FLX2         E1000_WUFC_FLX2
+#define E1000_WUS_FLX3         E1000_WUFC_FLX3
+#define E1000_WUS_FLX4         E1000_WUFC_FLX4
+#define E1000_WUS_FLX5         E1000_WUFC_FLX5
+#define E1000_WUS_FLX6         E1000_WUFC_FLX6
+#define E1000_WUS_FLX7         E1000_WUFC_FLX7
+#define E1000_WUS_FLX4_PHY     E1000_WUFC_FLX4_PHY
+#define E1000_WUS_FLX5_PHY     E1000_WUFC_FLX5_PHY
+#define E1000_WUS_FLX6_PHY     0x0400
+#define E1000_WUS_FLX7_PHY     0x0800
+#define E1000_WUS_FLX_FILTERS  E1000_WUFC_FLX_FILTERS
+#define E1000_WUS_FLX_FILTERS_6                E1000_WUFC_FLX_FILTERS_6
+#define E1000_WUS_FLX_FILTERS_8                E1000_WUFC_FLX_FILTERS_8
+#define E1000_WUS_FLX_FILTERS_PHY_6    E1000_WUFC_FLX_FILTERS_PHY_6
+
+/* Wake Up Packet Length */
+#define E1000_WUPL_LENGTH_MASK 0x0FFF  /* Only the lower 12 bits are valid */
+
+/* Four Flexible Filters are supported */
+#define E1000_FLEXIBLE_FILTER_COUNT_MAX                4
+/* Six Flexible Filters are supported */
+#define E1000_FLEXIBLE_FILTER_COUNT_MAX_6      6
+/* Eight Flexible Filters are supported */
+#define E1000_FLEXIBLE_FILTER_COUNT_MAX_8      8
+
+/* Each Flexible Filter is at most 128 (0x80) bytes in length */
+#define E1000_FLEXIBLE_FILTER_SIZE_MAX 128
+
+#define E1000_FFLT_SIZE                E1000_FLEXIBLE_FILTER_COUNT_MAX
+#define E1000_FFLT_SIZE_6      E1000_FLEXIBLE_FILTER_COUNT_MAX_6
+#define E1000_FFLT_SIZE_8      E1000_FLEXIBLE_FILTER_COUNT_MAX_8
+#define E1000_FFMT_SIZE                E1000_FLEXIBLE_FILTER_SIZE_MAX
+#define E1000_FFVT_SIZE                E1000_FLEXIBLE_FILTER_SIZE_MAX
 
 /* Extended Device Control */
-#define E1000_CTRL_EXT_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
+#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_LPCD            0x00000004      /* LCD Power Cycle Done */
+#define E1000_CTRL_EXT_GPI3_EN         0x00000008      /* Maps SDP7 to GPI3 */
+/* Reserved (bits 4,5) in >= 82575 */
+#define E1000_CTRL_EXT_SDP4_DATA       0x00000010      /* SW Definable Pin 4 data */
+#define E1000_CTRL_EXT_SDP5_DATA       0x00000020      /* SW Definable Pin 5 data */
+#define E1000_CTRL_EXT_PHY_INT         E1000_CTRL_EXT_SDP5_DATA
+#define E1000_CTRL_EXT_SDP6_DATA       0x00000040      /* SW Definable Pin 6 data */
+#define E1000_CTRL_EXT_SDP3_DATA       0x00000080      /* SW Definable Pin 3 data */
+/* SDP 4/5 (bits 8,9) are reserved in >= 82575 */
+#define E1000_CTRL_EXT_SDP4_DIR        0x00000100      /* Direction of SDP4 0=in 1=out */
+#define E1000_CTRL_EXT_SDP5_DIR        0x00000200      /* Direction of SDP5 0=in 1=out */
+#define E1000_CTRL_EXT_SDP6_DIR        0x00000400      /* Direction of SDP6 0=in 1=out */
+#define E1000_CTRL_EXT_SDP3_DIR        0x00000800      /* Direction of SDP3 0=in 1=out */
+#define E1000_CTRL_EXT_FORCE_SMBUS     0x00000800      /* Force SMBus mode */
+#define E1000_CTRL_EXT_ASDCHK  0x00001000      /* Initiate an ASD sequence */
+#define E1000_CTRL_EXT_EE_RST  0x00002000      /* Reinitialize from EEPROM */
+#define E1000_CTRL_EXT_IPS     0x00004000      /* Invert Power State */
+#define E1000_CTRL_EXT_SPD_BYPS        0x00008000      /* Speed Select Bypass */
+#define E1000_CTRL_EXT_RO_DIS  0x00020000      /* Relaxed Ordering disable */
+#define E1000_CTRL_EXT_DMA_DYN_CLK_EN  0x00080000      /* DMA Dynamic Clk Gating */
+#define E1000_CTRL_EXT_LINK_MODE_MASK  0x00C00000
+/* Offset of the link mode field in Ctrl Ext register */
+#define E1000_CTRL_EXT_LINK_MODE_OFFSET        22
+#define E1000_CTRL_EXT_LINK_MODE_GMII  0x00000000
+#define E1000_CTRL_EXT_LINK_MODE_TBI   0x00C00000
+#define E1000_CTRL_EXT_LINK_MODE_KMRN  0x00000000
+#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES   0x00C00000
+#define E1000_CTRL_EXT_LINK_MODE_PCIX_SERDES   0x00800000
+#define E1000_CTRL_EXT_LINK_MODE_SGMII 0x00800000
+#define E1000_CTRL_EXT_EIAME           0x01000000
+#define E1000_CTRL_EXT_IRCA            0x00000001
+#define E1000_CTRL_EXT_WR_WMARK_MASK   0x03000000
+#define E1000_CTRL_EXT_WR_WMARK_256    0x00000000
+#define E1000_CTRL_EXT_WR_WMARK_320    0x01000000
+#define E1000_CTRL_EXT_WR_WMARK_384    0x02000000
+#define E1000_CTRL_EXT_WR_WMARK_448    0x03000000
+#define E1000_CTRL_EXT_CANC            0x04000000      /* Int delay cancellation */
+#define E1000_CTRL_EXT_DRV_LOAD                0x10000000      /* Drv loaded bit for FW */
+/* IAME enable bit (27) was removed in >= 82575 */
+#define E1000_CTRL_EXT_IAME            0x08000000      /* Int ACK Auto-mask */
+/* packet buffer parity error detection enabled */
+#define E1000_CRTL_EXT_PB_PAREN                0x01000000
+/* descriptor FIFO parity error detection enable */
+#define E1000_CTRL_EXT_DF_PAREN                0x02000000
+#define E1000_CTRL_EXT_GHOST_PAREN     0x40000000
+#define E1000_CTRL_EXT_PBA_CLR         0x80000000      /* PBA Clear */
+#define E1000_CTRL_EXT_LSECCK          0x00001000
+#define E1000_CTRL_EXT_PHYPDEN         0x00100000
+#define E1000_I2CCMD_REG_ADDR_SHIFT    16
+#define E1000_I2CCMD_REG_ADDR          0x00FF0000
+#define E1000_I2CCMD_PHY_ADDR_SHIFT    24
+#define E1000_I2CCMD_PHY_ADDR          0x07000000
+#define E1000_I2CCMD_OPCODE_READ       0x08000000
+#define E1000_I2CCMD_OPCODE_WRITE      0x00000000
+#define E1000_I2CCMD_RESET             0x10000000
+#define E1000_I2CCMD_READY             0x20000000
+#define E1000_I2CCMD_INTERRUPT_ENA     0x40000000
+#define E1000_I2CCMD_ERROR             0x80000000
+#define E1000_I2CCMD_SFP_DATA_ADDR(a)  (0x0000 + (a))
+#define E1000_I2CCMD_SFP_DIAG_ADDR(a)  (0x0100 + (a))
+#define E1000_MAX_SGMII_PHY_REG_ADDR   255
+#define E1000_I2CCMD_PHY_TIMEOUT       200
 
 /* Receive Descriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_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
+#define E1000_RXD_STAT_DD      0x01    /* Descriptor Done */
+#define E1000_RXD_STAT_EOP     0x02    /* End of Packet */
+#define E1000_RXD_STAT_IXSM    0x04    /* Ignore checksum */
+#define E1000_RXD_STAT_VP      0x08    /* IEEE VLAN Packet */
+#define E1000_RXD_STAT_UDPCS   0x10    /* UDP xsum calculated */
+#define E1000_RXD_STAT_TCPCS   0x20    /* TCP xsum calculated */
+#define E1000_RXD_STAT_IPCS    0x40    /* IP xsum calculated */
+#define E1000_RXD_STAT_PIF     0x80    /* passed in-exact filter */
+#define E1000_RXD_STAT_CRCV    0x100   /* Speculative CRC Valid */
+#define E1000_RXD_STAT_IPIDV   0x200   /* IP identification valid */
+#define E1000_RXD_STAT_UDPV    0x400   /* Valid UDP checksum */
+#define E1000_RXD_STAT_DYNINT  0x800   /* Pkt caused INT via DYNINT */
+#define E1000_RXD_STAT_ACK     0x8000  /* ACK Packet indication */
+#define E1000_RXD_ERR_CE       0x01    /* CRC Error */
+#define E1000_RXD_ERR_SE       0x02    /* Symbol Error */
+#define E1000_RXD_ERR_SEQ      0x04    /* Sequence Error */
+#define E1000_RXD_ERR_CXE      0x10    /* Carrier Extension Error */
+#define E1000_RXD_ERR_TCPE     0x20    /* TCP/UDP Checksum Error */
+#define E1000_RXD_ERR_IPE      0x40    /* IP Checksum Error */
+#define E1000_RXD_ERR_RXE      0x80    /* Rx Data Error */
+#define E1000_RXD_SPC_VLAN_MASK        0x0FFF  /* VLAN ID is in lower 12 bits */
+#define E1000_RXD_SPC_PRI_MASK 0xE000  /* Priority is in upper 3 bits */
+#define E1000_RXD_SPC_PRI_SHIFT        13
+#define E1000_RXD_SPC_CFI_MASK 0x1000  /* CFI is bit 12 */
+#define E1000_RXD_SPC_CFI_SHIFT        12
+
+#define E1000_RXDEXT_STATERR_LB                0x00040000
+#define E1000_RXDEXT_STATERR_CE                0x01000000
+#define E1000_RXDEXT_STATERR_SE                0x02000000
+#define E1000_RXDEXT_STATERR_SEQ       0x04000000
+#define E1000_RXDEXT_STATERR_CXE       0x10000000
+#define E1000_RXDEXT_STATERR_TCPE      0x20000000
+#define E1000_RXDEXT_STATERR_IPE       0x40000000
+#define E1000_RXDEXT_STATERR_RXE       0x80000000
+
+#define E1000_RXDEXT_LSECH             0x01000000
+#define E1000_RXDEXT_LSECE_MASK                0x60000000
+#define E1000_RXDEXT_LSECE_NO_ERROR    0x00000000
+#define E1000_RXDEXT_LSECE_NO_SA_MATCH 0x20000000
+#define E1000_RXDEXT_LSECE_REPLAY_DETECT 0x40000000
+#define E1000_RXDEXT_LSECE_BAD_SIG     0x60000000
 
 /* mask to determine if packets should be dropped due to frame errors */
 #define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-    E1000_RXD_ERR_CE  |                \
-    E1000_RXD_ERR_SE  |                \
-    E1000_RXD_ERR_SEQ |                \
-    E1000_RXD_ERR_CXE |                \
-    E1000_RXD_ERR_RXE)
+       E1000_RXD_ERR_CE  |             \
+       E1000_RXD_ERR_SE  |             \
+       E1000_RXD_ERR_SEQ |             \
+       E1000_RXD_ERR_CXE |             \
+       E1000_RXD_ERR_RXE)
 
 /* Same mask, but for extended and packet split descriptors */
 #define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-#define E1000_MRQC_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              0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
-
-#define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
+       E1000_RXDEXT_STATERR_CE  |      \
+       E1000_RXDEXT_STATERR_SE  |      \
+       E1000_RXDEXT_STATERR_SEQ |      \
+       E1000_RXDEXT_STATERR_CXE |      \
+       E1000_RXDEXT_STATERR_RXE)
+
+#define E1000_MRQC_ENABLE_MASK                 0x00000007
+#define E1000_MRQC_ENABLE_RSS_2Q               0x00000001
+#define E1000_MRQC_ENABLE_RSS_INT              0x00000004
+#define E1000_MRQC_RSS_FIELD_MASK              0xFFFF0000
+#define E1000_MRQC_RSS_FIELD_IPV4_TCP          0x00010000
+#define E1000_MRQC_RSS_FIELD_IPV4              0x00020000
+#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX       0x00040000
+#define E1000_MRQC_RSS_FIELD_IPV6_EX           0x00080000
+#define E1000_MRQC_RSS_FIELD_IPV6              0x00100000
+#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
+
+#define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
+#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK                0x000003FF
 
 /* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_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 */
+#define E1000_MANC_SMBUS_EN    0x00000001      /* SMBus Enabled - RO */
+#define E1000_MANC_ASF_EN      0x00000002      /* ASF Enabled - RO */
+#define E1000_MANC_R_ON_FORCE  0x00000004      /* Reset on Force TCO - RO */
+#define E1000_MANC_RMCP_EN     0x00000100      /* Enable RCMP 026Fh Filtering */
+#define E1000_MANC_0298_EN     0x00000200      /* Enable RCMP 0298h Filtering */
+#define E1000_MANC_IPV4_EN     0x00000400      /* Enable IPv4 */
+#define E1000_MANC_IPV6_EN     0x00000800      /* Enable IPv6 */
+#define E1000_MANC_SNAP_EN     0x00001000      /* Accept LLC/SNAP */
+#define E1000_MANC_ARP_EN      0x00002000      /* Enable ARP Request Filtering */
+/* Enable Neighbor Discovery Filtering */
+#define E1000_MANC_NEIGHBOR_EN 0x00004000
+#define E1000_MANC_ARP_RES_EN  0x00008000      /* Enable ARP response Filtering */
+#define E1000_MANC_TCO_RESET   0x00010000      /* TCO Reset Occurred */
+#define E1000_MANC_RCV_TCO_EN  0x00020000      /* Receive TCO Packets Enabled */
+#define E1000_MANC_REPORT_STATUS 0x00040000    /* Status Reporting Enabled */
+#define E1000_MANC_RCV_ALL     0x00080000      /* Receive All Enabled */
+#define E1000_MANC_BLK_PHY_RST_ON_IDE  0x00040000      /* Block phy resets */
 /* Enable MAC address filtering */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000
+#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 */
+#define E1000_MANC_EN_MNG2HOST         0x00200000
+/* Enable IP address filtering */
+#define E1000_MANC_EN_IP_ADDR_FILTER   0x00400000
+#define E1000_MANC_EN_XSUM_FILTER      0x00800000      /* Ena checksum filtering */
+#define E1000_MANC_BR_EN               0x01000000      /* Ena 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 */
+
+#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 */
+#define E1000_RCTL_RST         0x00000001      /* Software reset */
+#define E1000_RCTL_EN          0x00000002      /* enable */
+#define E1000_RCTL_SBP         0x00000004      /* store bad packet */
+#define E1000_RCTL_UPE         0x00000008      /* unicast promisc enable */
+#define E1000_RCTL_MPE         0x00000010      /* multicast promisc enable */
+#define E1000_RCTL_LPE         0x00000020      /* long packet enable */
+#define E1000_RCTL_LBM_NO      0x00000000      /* no loopback mode */
+#define E1000_RCTL_LBM_MAC     0x00000040      /* MAC loopback mode */
+#define E1000_RCTL_LBM_SLP     0x00000080      /* serial link loopback mode */
+#define E1000_RCTL_LBM_TCVR    0x000000C0      /* tcvr loopback mode */
+#define E1000_RCTL_DTYP_MASK   0x00000C00      /* Descriptor type mask */
+#define E1000_RCTL_DTYP_PS     0x00000400      /* Packet Split descriptor */
+#define E1000_RCTL_RDMTS_HALF  0x00000000      /* Rx desc min thresh size */
+#define E1000_RCTL_RDMTS_QUAT  0x00000100      /* Rx desc min thresh size */
+#define E1000_RCTL_RDMTS_EIGTH 0x00000200      /* Rx desc min thresh size */
+#define E1000_RCTL_MO_SHIFT    12      /* multicast offset shift */
+#define E1000_RCTL_MO_0                0x00000000      /* multicast offset 11:0 */
+#define E1000_RCTL_MO_1                0x00001000      /* multicast offset 12:1 */
+#define E1000_RCTL_MO_2                0x00002000      /* multicast offset 13:2 */
+#define E1000_RCTL_MO_3                0x00003000      /* multicast offset 15:4 */
+#define E1000_RCTL_MDR         0x00004000      /* multicast desc ring 0 */
+#define E1000_RCTL_BAM         0x00008000      /* broadcast enable */
 /* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* Rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* Rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* Rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* Rx buffer size 256 */
+#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 */
+#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))
+ *               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_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 */
+#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
+#define E1000_SWFW_EEP_SM      0x01
+#define E1000_SWFW_PHY0_SM     0x02
+#define E1000_SWFW_PHY1_SM     0x04
+#define E1000_SWFW_CSR_SM      0x08
 
+/* FACTPS Definitions */
+#define E1000_FACTPS_LFS       0x40000000      /* LAN Function Select */
 /* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_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 */
+#define E1000_CTRL_FD          0x00000001      /* Full duplex.0=half; 1=full */
+#define E1000_CTRL_BEM         0x00000002      /* Endian Mode.0=little,1=big */
+#define E1000_CTRL_PRIOR       0x00000004      /* Priority on PCI. 0=rx,1=fair */
+#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004       /*Blocks new Master reqs */
+#define E1000_CTRL_LRST                0x00000008      /* Link reset. 0=normal,1=reset */
+#define E1000_CTRL_TME         0x00000010      /* Test mode. 0=normal,1=test */
+#define E1000_CTRL_SLE         0x00000020      /* Serial Link on 0=dis,1=en */
+#define E1000_CTRL_ASDE                0x00000020      /* Auto-speed detect enable */
+#define E1000_CTRL_SLU         0x00000040      /* Set link up (Force Link) */
+#define E1000_CTRL_ILOS                0x00000080      /* Invert Loss-Of Signal */
+#define E1000_CTRL_SPD_SEL     0x00000300      /* Speed Select Mask */
+#define E1000_CTRL_SPD_10      0x00000000      /* Force 10Mb */
+#define E1000_CTRL_SPD_100     0x00000100      /* Force 100Mb */
+#define E1000_CTRL_SPD_1000    0x00000200      /* Force 1Gb */
+#define E1000_CTRL_BEM32       0x00000400      /* Big Endian 32 mode */
+#define E1000_CTRL_FRCSPD      0x00000800      /* Force Speed */
+#define E1000_CTRL_FRCDPX      0x00001000      /* Force Duplex */
+#define E1000_CTRL_D_UD_EN     0x00002000      /* Dock/Undock enable */
+/* Defined polarity of Dock/Undock indication in SDP[0] */
+#define E1000_CTRL_D_UD_POLARITY       0x00004000
+/* Reset both PHY ports, through PHYRST_N pin */
+#define E1000_CTRL_FORCE_PHY_RESET     0x00008000
+/* enable link status from external LINK_0 and LINK_1 pins */
+#define E1000_CTRL_EXT_LINK_EN         0x00010000
+#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_SWDPIN2     0x00100000      /* SWDPIN 2 value */
+#define E1000_CTRL_SWDPIN3     0x00200000      /* SWDPIN 3 value */
+#define E1000_CTRL_SWDPIO0     0x00400000      /* SWDPIN 0 Input or output */
+#define E1000_CTRL_SWDPIO1     0x00800000      /* SWDPIN 1 input or output */
+#define E1000_CTRL_SWDPIO2     0x01000000      /* SWDPIN 2 input or output */
+#define E1000_CTRL_SWDPIO3     0x02000000      /* SWDPIN 3 input or output */
+#define E1000_CTRL_RST         0x04000000      /* Global reset */
+#define E1000_CTRL_RFCE                0x08000000      /* Receive Flow Control enable */
+#define E1000_CTRL_TFCE                0x10000000      /* Transmit flow control enable */
+#define E1000_CTRL_RTE         0x20000000      /* Routing tag enable */
+#define E1000_CTRL_VME         0x40000000      /* IEEE VLAN mode enable */
+#define E1000_CTRL_PHY_RST     0x80000000      /* PHY Reset */
+#define E1000_CTRL_SW2FW_INT   0x02000000      /* Initiate an interrupt to ME */
+#define E1000_CTRL_I2C_ENA     0x02000000      /* I2C enable */
 
 /*
  * Bit definitions for the Management Data IO (MDIO) and Management Data
  * Clock (MDC) pins in the Device Control Register.
  */
+#define E1000_CTRL_PHY_RESET_DIR       E1000_CTRL_SWDPIO0
+#define E1000_CTRL_PHY_RESET           E1000_CTRL_SWDPIN0
+#define E1000_CTRL_MDIO_DIR            E1000_CTRL_SWDPIO2
+#define E1000_CTRL_MDIO                        E1000_CTRL_SWDPIN2
+#define E1000_CTRL_MDC_DIR             E1000_CTRL_SWDPIO3
+#define E1000_CTRL_MDC                 E1000_CTRL_SWDPIN3
+#define E1000_CTRL_PHY_RESET_DIR4      E1000_CTRL_EXT_SDP4_DIR
+#define E1000_CTRL_PHY_RESET4          E1000_CTRL_EXT_SDP4_DATA
+
+#define E1000_CONNSW_ENRGSRC           0x4
+#define E1000_PCS_CFG_PCS_EN           8
+#define E1000_PCS_LCTL_FLV_LINK_UP     1
+#define E1000_PCS_LCTL_FSV_10          0
+#define E1000_PCS_LCTL_FSV_100         2
+#define E1000_PCS_LCTL_FSV_1000                4
+#define E1000_PCS_LCTL_FDV_FULL                8
+#define E1000_PCS_LCTL_FSD             0x10
+#define E1000_PCS_LCTL_FORCE_LINK      0x20
+#define E1000_PCS_LCTL_LOW_LINK_LATCH  0x40
+#define E1000_PCS_LCTL_FORCE_FCTRL     0x80
+#define E1000_PCS_LCTL_AN_ENABLE       0x10000
+#define E1000_PCS_LCTL_AN_RESTART      0x20000
+#define E1000_PCS_LCTL_AN_TIMEOUT      0x40000
+#define E1000_PCS_LCTL_AN_SGMII_BYPASS 0x80000
+#define E1000_PCS_LCTL_AN_SGMII_TRIGGER        0x100000
+#define E1000_PCS_LCTL_FAST_LINK_TIMER 0x1000000
+#define E1000_PCS_LCTL_LINK_OK_FIX     0x2000000
+#define E1000_PCS_LCTL_CRS_ON_NI       0x4000000
+#define E1000_ENABLE_SERDES_LOOPBACK   0x0410
+
+#define E1000_PCS_LSTS_LINK_OK         1
+#define E1000_PCS_LSTS_SPEED_10                0
+#define E1000_PCS_LSTS_SPEED_100       2
+#define E1000_PCS_LSTS_SPEED_1000      4
+#define E1000_PCS_LSTS_DUPLEX_FULL     8
+#define E1000_PCS_LSTS_SYNK_OK         0x10
+#define E1000_PCS_LSTS_AN_COMPLETE     0x10000
+#define E1000_PCS_LSTS_AN_PAGE_RX      0x20000
+#define E1000_PCS_LSTS_AN_TIMED_OUT    0x40000
+#define E1000_PCS_LSTS_AN_REMOTE_FAULT 0x80000
+#define E1000_PCS_LSTS_AN_ERROR_RWS    0x100000
 
 /* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-#define E1000_STATUS_FUNC_SHIFT 2
-#define E1000_STATUS_FUNC_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. */
+#define E1000_STATUS_FD                        0x00000001      /* 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 Compltn by NVM */
+#define E1000_STATUS_ASDV              0x00000300      /* Auto speed detect value */
+#define E1000_STATUS_PHYRA             0x00000400      /* PHY Reset Asserted */
+/* Change in Dock/Undock state clear on write '0'. */
+#define E1000_STATUS_DOCK_CI           0x00000800
+#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000      /* Master request status */
+#define E1000_STATUS_MTXCKOK           0x00000400      /* MTX clock running OK */
+#define E1000_STATUS_PCI66             0x00000800      /* In 66Mhz slot */
+#define E1000_STATUS_BUS64             0x00001000      /* In 64 bit slot */
+#define E1000_STATUS_PCIX_MODE         0x00002000      /* PCI-X mode */
+#define E1000_STATUS_PCIX_SPEED                0x0000C000      /* PCI-X bus speed */
+#define E1000_STATUS_BMC_SKU_0         0x00100000      /* BMC USB redirect disbld */
+#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 */
+/* BMC external code execution disabled */
+#define E1000_STATUS_BMC_LITE          0x01000000
+#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 disbld on port 0 */
+#define E1000_STATUS_SERDES1_DIS       0x20000000      /* SERDES disbld on port 1 */
 
 /* Constants used to interpret the masked PCI-X bus speed. */
+#define E1000_STATUS_PCIX_SPEED_66     0x00000000      /* PCI-X bus spd 50-66MHz */
+#define E1000_STATUS_PCIX_SPEED_100    0x00004000      /* PCI-X bus spd 66-100MHz */
+#define E1000_STATUS_PCIX_SPEED_133    0x00008000      /* PCI-X bus spd 100-133MHz */
 
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
+#define SPEED_10       10
+#define SPEED_100      100
+#define SPEED_1000     1000
+#define HALF_DUPLEX    1
+#define FULL_DUPLEX    2
 
+#define PHY_FORCE_TIME 20
 
-#define ADVERTISE_10_HALF                 0x0001
-#define ADVERTISE_10_FULL                 0x0002
-#define ADVERTISE_100_HALF                0x0004
-#define ADVERTISE_100_FULL                0x0008
-#define ADVERTISE_1000_HALF               0x0010 /* Not used, just FYI */
-#define ADVERTISE_1000_FULL               0x0020
+#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
+#define E1000_ALL_SPEED_DUPLEX ( \
+       ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \
+       ADVERTISE_100_FULL | ADVERTISE_1000_FULL)
+#define E1000_ALL_NOT_GIG      ( \
+       ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \
+       ADVERTISE_100_FULL)
+#define E1000_ALL_100_SPEED    (ADVERTISE_100_HALF | ADVERTISE_100_FULL)
+#define E1000_ALL_10_SPEED     (ADVERTISE_10_HALF | ADVERTISE_10_FULL)
+#define E1000_ALL_FULL_DUPLEX  ( \
+       ADVERTISE_10_FULL | ADVERTISE_100_FULL | ADVERTISE_1000_FULL)
+#define E1000_ALL_HALF_DUPLEX  (ADVERTISE_10_HALF | ADVERTISE_100_HALF)
+
+#define AUTONEG_ADVERTISE_SPEED_DEFAULT                E1000_ALL_SPEED_DUPLEX
 
 /* LED Control */
-#define E1000_PHY_LED0_MODE_MASK          0x00000007
-#define E1000_PHY_LED0_IVRT               0x00000008
-#define E1000_PHY_LED0_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
+#define E1000_PHY_LED0_MODE_MASK       0x00000007
+#define E1000_PHY_LED0_IVRT            0x00000008
+#define E1000_PHY_LED0_BLINK           0x00000010
+#define E1000_PHY_LED0_MASK            0x0000001F
+
+#define E1000_LEDCTL_LED0_MODE_MASK    0x0000000F
+#define E1000_LEDCTL_LED0_MODE_SHIFT   0
+#define E1000_LEDCTL_LED0_BLINK_RATE   0x00000020
+#define E1000_LEDCTL_LED0_IVRT         0x00000040
+#define E1000_LEDCTL_LED0_BLINK                0x00000080
+#define E1000_LEDCTL_LED1_MODE_MASK    0x00000F00
+#define E1000_LEDCTL_LED1_MODE_SHIFT   8
+#define E1000_LEDCTL_LED1_BLINK_RATE   0x00002000
+#define E1000_LEDCTL_LED1_IVRT         0x00004000
+#define E1000_LEDCTL_LED1_BLINK                0x00008000
+#define E1000_LEDCTL_LED2_MODE_MASK    0x000F0000
+#define E1000_LEDCTL_LED2_MODE_SHIFT   16
+#define E1000_LEDCTL_LED2_BLINK_RATE   0x00200000
+#define E1000_LEDCTL_LED2_IVRT         0x00400000
+#define E1000_LEDCTL_LED2_BLINK                0x00800000
+#define E1000_LEDCTL_LED3_MODE_MASK    0x0F000000
+#define E1000_LEDCTL_LED3_MODE_SHIFT   24
+#define E1000_LEDCTL_LED3_BLINK_RATE   0x20000000
+#define E1000_LEDCTL_LED3_IVRT         0x40000000
+#define E1000_LEDCTL_LED3_BLINK                0x80000000
+
+#define E1000_LEDCTL_MODE_LINK_10_1000 0x0
+#define E1000_LEDCTL_MODE_LINK_100_1000        0x1
+#define E1000_LEDCTL_MODE_LINK_UP      0x2
+#define E1000_LEDCTL_MODE_ACTIVITY     0x3
+#define E1000_LEDCTL_MODE_LINK_ACTIVITY        0x4
+#define E1000_LEDCTL_MODE_LINK_10      0x5
+#define E1000_LEDCTL_MODE_LINK_100     0x6
+#define E1000_LEDCTL_MODE_LINK_1000    0x7
+#define E1000_LEDCTL_MODE_PCIX_MODE    0x8
+#define E1000_LEDCTL_MODE_FULL_DUPLEX  0x9
+#define E1000_LEDCTL_MODE_COLLISION    0xA
+#define E1000_LEDCTL_MODE_BUS_SPEED    0xB
+#define E1000_LEDCTL_MODE_BUS_SIZE     0xC
+#define E1000_LEDCTL_MODE_PAUSED       0xD
+#define E1000_LEDCTL_MODE_LED_ON       0xE
+#define E1000_LEDCTL_MODE_LED_OFF      0xF
 
 /* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-#define E1000_TXD_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 */
+#define E1000_TXD_DTYP_D       0x00100000      /* Data Descriptor */
+#define E1000_TXD_DTYP_C       0x00000000      /* Context Descriptor */
+#define E1000_TXD_POPTS_SHIFT  8       /* POPTS shift */
+#define E1000_TXD_POPTS_IXSM   0x01    /* Insert IP checksum */
+#define E1000_TXD_POPTS_TXSM   0x02    /* Insert TCP/UDP checksum */
+#define E1000_TXD_CMD_EOP      0x01000000      /* End of Packet */
+#define E1000_TXD_CMD_IFCS     0x02000000      /* Insert FCS (Ethernet CRC) */
+#define E1000_TXD_CMD_IC       0x04000000      /* Insert Checksum */
+#define E1000_TXD_CMD_RS       0x08000000      /* Report Status */
+#define E1000_TXD_CMD_RPS      0x10000000      /* Report Packet Sent */
+#define E1000_TXD_CMD_DEXT     0x20000000      /* Desc extension (0 = legacy) */
+#define E1000_TXD_CMD_VLE      0x40000000      /* Add VLAN tag */
+#define E1000_TXD_CMD_IDE      0x80000000      /* Enable Tidv register */
+#define E1000_TXD_STAT_DD      0x00000001      /* Descriptor Done */
+#define E1000_TXD_STAT_EC      0x00000002      /* Excess Collisions */
+#define E1000_TXD_STAT_LC      0x00000004      /* Late Collisions */
+#define E1000_TXD_STAT_TU      0x00000008      /* Transmit underrun */
+#define E1000_TXD_CMD_TCP      0x01000000      /* TCP packet */
+#define E1000_TXD_CMD_IP       0x02000000      /* IP packet */
+#define E1000_TXD_CMD_TSE      0x04000000      /* TCP Seg enable */
+#define E1000_TXD_STAT_TC      0x00000004      /* Tx Underrun */
+/* Extended desc bits for Linksec and timesync */
+#define E1000_TXD_CMD_LINKSEC  0x10000000      /* Apply LinkSec on packet */
+#define E1000_TXD_EXTCMD_TSTAMP        0x00000010      /* IEEE1588 Timestamp packet */
 
 /* Transmit Control */
-#define E1000_TCTL_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 */
+#define E1000_TCTL_RST         0x00000001      /* software reset */
+#define E1000_TCTL_EN          0x00000002      /* enable Tx */
+#define E1000_TCTL_BCE         0x00000004      /* busy check enable */
+#define E1000_TCTL_PSP         0x00000008      /* pad short packets */
+#define E1000_TCTL_CT          0x00000ff0      /* collision threshold */
+#define E1000_TCTL_COLD                0x003ff000      /* collision distance */
+#define E1000_TCTL_SWXOFF      0x00400000      /* SW Xoff transmission */
+#define E1000_TCTL_PBE         0x00800000      /* Packet Burst Enable */
+#define E1000_TCTL_RTLC                0x01000000      /* Re-transmit on late collision */
+#define E1000_TCTL_NRTU                0x02000000      /* No Re-transmit on underrun */
+#define E1000_TCTL_MULR                0x10000000      /* Multiple request support */
 
 /* Transmit Arbitration Count */
+#define E1000_TARC0_ENABLE     0x00000400      /* Enable Tx Queue 0 */
 
 /* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
+#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 */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
+#define E1000_RXCSUM_PCSS_MASK 0x000000FF      /* Packet Checksum Start */
+#define E1000_RXCSUM_IPOFL     0x00000100      /* IPv4 checksum offload */
+#define E1000_RXCSUM_TUOFL     0x00000200      /* TCP / UDP checksum offload */
+#define E1000_RXCSUM_IPV6OFL   0x00000400      /* IPv6 checksum offload */
+#define E1000_RXCSUM_CRCOFL    0x00000800      /* CRC32 offload enable */
+#define E1000_RXCSUM_IPPCSE    0x00001000      /* IP payload checksum enable */
+#define E1000_RXCSUM_PCSD      0x00002000      /* packet checksum disabled */
 
 /* Header split receive */
-#define E1000_RFCTL_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
+#define E1000_RFCTL_ISCSI_DIS          0x00000001
+#define E1000_RFCTL_ISCSI_DWC_MASK     0x0000003E
+#define E1000_RFCTL_ISCSI_DWC_SHIFT    1
+#define E1000_RFCTL_NFSW_DIS           0x00000040
+#define E1000_RFCTL_NFSR_DIS           0x00000080
+#define E1000_RFCTL_NFS_VER_MASK       0x00000300
+#define E1000_RFCTL_NFS_VER_SHIFT      8
+#define E1000_RFCTL_IPV6_DIS           0x00000400
+#define E1000_RFCTL_IPV6_XSUM_DIS      0x00000800
+#define E1000_RFCTL_ACK_DIS            0x00001000
+#define E1000_RFCTL_ACKD_DIS           0x00002000
+#define E1000_RFCTL_IPFRSP_DIS         0x00004000
+#define E1000_RFCTL_EXTEN              0x00008000
+#define E1000_RFCTL_IPV6_EX_DIS                0x00010000
+#define E1000_RFCTL_NEW_IPV6_EXT_DIS   0x00020000
+#define E1000_RFCTL_LEF                        0x00040000
 
 /* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLD_SHIFT                12
+#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 DEFAULT_82543_TIPG_IPGT_FIBER  9
+#define DEFAULT_82543_TIPG_IPGT_COPPER 8
 
-#define E1000_TIPG_IPGT_MASK  0x000003FF
+#define E1000_TIPG_IPGT_MASK           0x000003FF
+#define E1000_TIPG_IPGR1_MASK          0x000FFC00
+#define E1000_TIPG_IPGR2_MASK          0x3FF00000
 
-#define DEFAULT_82543_TIPG_IPGR1 8
-#define E1000_TIPG_IPGR1_SHIFT  10
+#define DEFAULT_82543_TIPG_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 DEFAULT_82543_TIPG_IPGR2       6
+#define DEFAULT_80003ES2LAN_TIPG_IPGR2 7
+#define E1000_TIPG_IPGR2_SHIFT         20
 
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
+/* Ethertype field values */
+#define ETHERNET_IEEE_VLAN_TYPE                0x8100  /* 802.3ac packet */
+
+#define ETHERNET_FCS_SIZE              4
+#define MAX_JUMBO_FRAME_SIZE           0x3F00
 
 /* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP      0x00000020
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE       0x00000001
-#define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE       0x00000008
-#define E1000_EXTCNF_CTRL_SWFLAG                 0x00000020
-#define E1000_EXTCNF_CTRL_GATE_PHY_CFG           0x00000080
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK   0x00FF0000
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT          16
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK   0x0FFF0000
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT          16
-
-#define E1000_PHY_CTRL_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
+#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP    0x00000020
+#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE     0x00000001
+#define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE     0x00000008
+#define E1000_EXTCNF_CTRL_SWFLAG               0x00000020
+#define E1000_EXTCNF_CTRL_GATE_PHY_CFG         0x00000080
+#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK 0x00FF0000
+#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT        16
+#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK 0x0FFF0000
+#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT        16
+
+#define E1000_PHY_CTRL_SPD_EN                  0x00000001
+#define E1000_PHY_CTRL_D0A_LPLU                        0x00000002
+#define E1000_PHY_CTRL_NOND0A_LPLU             0x00000004
+#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE      0x00000008
+#define E1000_PHY_CTRL_GBE_DISABLE             0x00000040
+
+#define E1000_KABGTXD_BGSQLBIAS                        0x00050000
 
 /* PBA constants */
-#define E1000_PBA_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
+#define E1000_PBA_6K           0x0006  /* 6KB */
+#define E1000_PBA_8K           0x0008  /* 8KB */
+#define E1000_PBA_10K          0x000A  /* 10KB */
+#define E1000_PBA_12K          0x000C  /* 12KB */
+#define E1000_PBA_14K          0x000E  /* 14KB */
+#define E1000_PBA_16K          0x0010  /* 16KB */
+#define E1000_PBA_18K          0x0012
+#define E1000_PBA_20K          0x0014
+#define E1000_PBA_22K          0x0016
+#define E1000_PBA_24K          0x0018
+#define E1000_PBA_26K          0x001A
+#define E1000_PBA_30K          0x001E
+#define E1000_PBA_32K          0x0020
+#define E1000_PBA_34K          0x0022
+#define E1000_PBA_35K          0x0023
+#define E1000_PBA_38K          0x0026
+#define E1000_PBA_40K          0x0028
+#define E1000_PBA_48K          0x0030  /* 48KB */
+#define E1000_PBA_64K          0x0040  /* 64KB */
+
+#define E1000_PBA_RXA_MASK     0xFFFF;
+
+#define E1000_PBS_16K          E1000_PBA_16K
+#define E1000_PBS_24K          E1000_PBA_24K
+
+#define IFS_MAX                        80
+#define IFS_MIN                        40
+#define IFS_RATIO              4
+#define IFS_STEP               10
+#define MIN_NUM_XMITS          1000
 
 /* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-#define E1000_SWSM_DRV_LOAD     0x00000008 /* Driver Loaded Bit */
+#define E1000_SWSM_SMBI                0x00000001      /* Driver Semaphore bit */
+#define E1000_SWSM_SWESMBI     0x00000002      /* FW Semaphore bit */
+#define E1000_SWSM_WMNG                0x00000004      /* Wake MNG Clock */
+#define E1000_SWSM_DRV_LOAD    0x00000008      /* Driver Loaded Bit */
 
-#define E1000_SWSM2_LOCK        0x00000002 /* Secondary driver semaphore bit */
+#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 */
+#define E1000_ICR_TXDW         0x00000001      /* Transmit desc written back */
+#define E1000_ICR_TXQE         0x00000002      /* Transmit Queue empty */
+#define E1000_ICR_LSC          0x00000004      /* Link Status Change */
+#define E1000_ICR_RXSEQ                0x00000008      /* Rx sequence error */
+#define E1000_ICR_RXDMT0       0x00000010      /* Rx desc min. threshold (0) */
+#define E1000_ICR_RXO          0x00000040      /* Rx overrun */
+#define E1000_ICR_RXT0         0x00000080      /* Rx timer intr (ring 0) */
+#define E1000_ICR_VMMB         0x00000100      /* VM MB event */
+#define E1000_ICR_MDAC         0x00000200      /* MDIO access complete */
+#define E1000_ICR_RXCFG                0x00000400      /* Rx /c/ ordered set */
+#define E1000_ICR_GPI_EN0      0x00000800      /* GP Int 0 */
+#define E1000_ICR_GPI_EN1      0x00001000      /* GP Int 1 */
+#define E1000_ICR_GPI_EN2      0x00002000      /* GP Int 2 */
+#define E1000_ICR_GPI_EN3      0x00004000      /* GP Int 3 */
+#define E1000_ICR_TXD_LOW      0x00008000
+#define E1000_ICR_SRPD         0x00010000
+#define E1000_ICR_ACK          0x00020000      /* Receive Ack frame */
+#define E1000_ICR_MNG          0x00040000      /* Manageability event */
+#define E1000_ICR_DOCK         0x00080000      /* Dock/Undock */
+/* If this bit asserted, the driver should claim the interrupt */
+#define E1000_ICR_INT_ASSERTED 0x80000000
+#define E1000_ICR_RXD_FIFO_PAR0        0x00100000      /* Q0 Rx desc FIFO parity error */
+#define E1000_ICR_TXD_FIFO_PAR0        0x00200000      /* Q0 Tx desc FIFO parity error */
+#define E1000_ICR_HOST_ARB_PAR 0x00400000      /* host arb read buffer parity err */
+#define E1000_ICR_PB_PAR       0x00800000      /* packet buffer parity error */
+#define E1000_ICR_RXD_FIFO_PAR1        0x01000000      /* Q1 Rx desc FIFO parity error */
+#define E1000_ICR_TXD_FIFO_PAR1        0x02000000      /* Q1 Tx desc FIFO parity error */
+#define E1000_ICR_ALL_PARITY   0x03F00000      /* all parity error bits */
+/* FW changed the status of DISSW bit in the FWSM */
+#define E1000_ICR_DSW          0x00000020
+/* LAN connected device generates an interrupt */
+#define E1000_ICR_PHYINT       0x00001000
+#define E1000_ICR_DOUTSYNC     0x10000000      /* NIC DMA out of sync */
+#define E1000_ICR_EPRST                0x00100000      /* ME hardware reset occurs */
+#define E1000_ICR_RXQ0         0x00100000      /* Rx Queue 0 Interrupt */
+#define E1000_ICR_RXQ1         0x00200000      /* Rx Queue 1 Interrupt */
+#define E1000_ICR_TXQ0         0x00400000      /* Tx Queue 0 Interrupt */
+#define E1000_ICR_TXQ1         0x00800000      /* Tx Queue 1 Interrupt */
+#define E1000_ICR_OTHER                0x01000000      /* Other Interrupts */
+
+#define E1000_ITR_MASK         0x000FFFFF      /* ITR value bitfield */
+#define E1000_ITR_MULT         256     /* ITR mulitplier in nsec */
 
 /* 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 */
+#define E1000_PBA_ECC_COUNTER_MASK     0xFFF00000      /* ECC counter mask */
+#define E1000_PBA_ECC_COUNTER_SHIFT    20      /* ECC counter shift value */
+#define E1000_PBA_ECC_CORR_EN  0x00000001      /* Enable ECC error correction */
+#define E1000_PBA_ECC_STAT_CLR 0x00000002      /* Clear ECC error counter */
+#define E1000_PBA_ECC_INT_EN   0x00000004      /* Enable ICR bit 5 on ECC error */
+
+/*
+ * This defines the bits that are set in the Interrupt Mask
+ * Set/Read Register.  Each bit is documented below:
+ *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
+ *   o RXSEQ  = Receive Sequence Error
+ */
+#define POLL_IMS_ENABLE_MASK ( \
+       E1000_IMS_RXDMT0 |    \
+       E1000_IMS_RXSEQ)
 
 /*
  * This defines the bits that are set in the Interrupt Mask
  *   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_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 */
+#define E1000_IMS_TXDW         E1000_ICR_TXDW  /* Tx desc written back */
+#define E1000_IMS_TXQE         E1000_ICR_TXQE  /* Transmit Queue empty */
+#define E1000_IMS_LSC          E1000_ICR_LSC   /* Link Status Change */
+#define E1000_IMS_VMMB         E1000_ICR_VMMB  /* Mail box activity */
+#define E1000_IMS_RXSEQ                E1000_ICR_RXSEQ /* Rx sequence error */
+#define E1000_IMS_RXDMT0       E1000_ICR_RXDMT0        /* Rx desc min. threshold */
+#define E1000_IMS_RXO          E1000_ICR_RXO   /* Rx overrun */
+#define E1000_IMS_RXT0         E1000_ICR_RXT0  /* Rx timer intr */
+#define E1000_IMS_MDAC         E1000_ICR_MDAC  /* MDIO access complete */
+#define E1000_IMS_RXCFG                E1000_ICR_RXCFG /* Rx /c/ ordered set */
+#define E1000_IMS_GPI_EN0      E1000_ICR_GPI_EN0       /* GP Int 0 */
+#define E1000_IMS_GPI_EN1      E1000_ICR_GPI_EN1       /* GP Int 1 */
+#define E1000_IMS_GPI_EN2      E1000_ICR_GPI_EN2       /* GP Int 2 */
+#define E1000_IMS_GPI_EN3      E1000_ICR_GPI_EN3       /* GP Int 3 */
+#define E1000_IMS_TXD_LOW      E1000_ICR_TXD_LOW
+#define E1000_IMS_SRPD         E1000_ICR_SRPD
+#define E1000_IMS_ACK          E1000_ICR_ACK   /* Receive Ack frame */
+#define E1000_IMS_MNG          E1000_ICR_MNG   /* Manageability event */
+#define E1000_IMS_DOCK         E1000_ICR_DOCK  /* Dock/Undock */
+/* Q0 Rx desc FIFO parity error */
+#define E1000_IMS_RXD_FIFO_PAR0        E1000_ICR_RXD_FIFO_PAR0
+/* Q0 Tx desc FIFO parity error */
+#define E1000_IMS_TXD_FIFO_PAR0        E1000_ICR_TXD_FIFO_PAR0
+/* host arb read buffer parity error */
+#define E1000_IMS_HOST_ARB_PAR E1000_ICR_HOST_ARB_PAR
+/* packet buffer parity error */
+#define E1000_IMS_PB_PAR       E1000_ICR_PB_PAR
+/* Q1 Rx desc FIFO parity error */
+#define E1000_IMS_RXD_FIFO_PAR1        E1000_ICR_RXD_FIFO_PAR1
+/* Q1 Tx desc FIFO parity error */
+#define E1000_IMS_TXD_FIFO_PAR1        E1000_ICR_TXD_FIFO_PAR1
+#define E1000_IMS_DSW          E1000_ICR_DSW
+#define E1000_IMS_PHYINT       E1000_ICR_PHYINT
+#define E1000_IMS_DOUTSYNC     E1000_ICR_DOUTSYNC      /* NIC DMA out of sync */
+#define E1000_IMS_EPRST                E1000_ICR_EPRST
+#define E1000_IMS_RXQ0         E1000_ICR_RXQ0  /* Rx Queue 0 Interrupt */
+#define E1000_IMS_RXQ1         E1000_ICR_RXQ1  /* Rx Queue 1 Interrupt */
+#define E1000_IMS_TXQ0         E1000_ICR_TXQ0  /* Tx Queue 0 Interrupt */
+#define E1000_IMS_TXQ1         E1000_ICR_TXQ1  /* Tx Queue 1 Interrupt */
+#define E1000_IMS_OTHER                E1000_ICR_OTHER /* Other Interrupts */
 
 /* Interrupt Cause Set */
-#define E1000_ICS_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_TXDW         E1000_ICR_TXDW  /* Tx desc written back */
+#define E1000_ICS_TXQE         E1000_ICR_TXQE  /* Transmit Queue empty */
+#define E1000_ICS_LSC          E1000_ICR_LSC   /* Link Status Change */
+#define E1000_ICS_RXSEQ                E1000_ICR_RXSEQ /* Rx sequence error */
+#define E1000_ICS_RXDMT0       E1000_ICR_RXDMT0        /* Rx desc min. threshold */
+#define E1000_ICS_RXO          E1000_ICR_RXO   /* Rx overrun */
+#define E1000_ICS_RXT0         E1000_ICR_RXT0  /* Rx timer intr */
+#define E1000_ICS_MDAC         E1000_ICR_MDAC  /* MDIO access complete */
+#define E1000_ICS_RXCFG                E1000_ICR_RXCFG /* Rx /c/ ordered set */
+#define E1000_ICS_GPI_EN0      E1000_ICR_GPI_EN0       /* GP Int 0 */
+#define E1000_ICS_GPI_EN1      E1000_ICR_GPI_EN1       /* GP Int 1 */
+#define E1000_ICS_GPI_EN2      E1000_ICR_GPI_EN2       /* GP Int 2 */
+#define E1000_ICS_GPI_EN3      E1000_ICR_GPI_EN3       /* GP Int 3 */
+#define E1000_ICS_TXD_LOW      E1000_ICR_TXD_LOW
+#define E1000_ICS_SRPD         E1000_ICR_SRPD
+#define E1000_ICS_ACK          E1000_ICR_ACK   /* Receive Ack frame */
+#define E1000_ICS_MNG          E1000_ICR_MNG   /* Manageability event */
+#define E1000_ICS_DOCK         E1000_ICR_DOCK  /* Dock/Undock */
+/* Q0 Rx desc FIFO parity error */
+#define E1000_ICS_RXD_FIFO_PAR0        E1000_ICR_RXD_FIFO_PAR0
+/* Q0 Tx desc FIFO parity error */
+#define E1000_ICS_TXD_FIFO_PAR0        E1000_ICR_TXD_FIFO_PAR0
+/* host arb read buffer parity error */
+#define E1000_ICS_HOST_ARB_PAR E1000_ICR_HOST_ARB_PAR
+/* packet buffer parity error */
+#define E1000_ICS_PB_PAR       E1000_ICR_PB_PAR
+/* Q1 Rx desc FIFO parity error */
+#define E1000_ICS_RXD_FIFO_PAR1        E1000_ICR_RXD_FIFO_PAR1
+/* Q1 Tx desc FIFO parity error */
+#define E1000_ICS_TXD_FIFO_PAR1        E1000_ICR_TXD_FIFO_PAR1
+#define E1000_ICS_DSW          E1000_ICR_DSW
+#define E1000_ICS_DOUTSYNC     E1000_ICR_DOUTSYNC      /* NIC DMA out of sync */
+#define E1000_ICS_PHYINT       E1000_ICR_PHYINT
+#define E1000_ICS_EPRST                E1000_ICR_EPRST
 
 /* Transmit Descriptor Control */
-#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
-#define E1000_TXDCTL_HTHRESH 0x00003F00 /* TXDCTL Host Threshold */
-#define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
-#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-#define E1000_TXDCTL_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
+#define E1000_TXDCTL_PTHRESH   0x0000003F      /* TXDCTL Prefetch Threshold */
+#define E1000_TXDCTL_HTHRESH   0x00003F00      /* TXDCTL Host Threshold */
+#define E1000_TXDCTL_WTHRESH   0x003F0000      /* TXDCTL Writeback Threshold */
+#define E1000_TXDCTL_GRAN      0x01000000      /* TXDCTL Granularity */
+#define E1000_TXDCTL_LWTHRESH  0xFE000000      /* TXDCTL Low Threshold */
+#define E1000_TXDCTL_FULL_TX_DESC_WB   0x01010000      /* GRAN=1, WTHRESH=1 */
+#define E1000_TXDCTL_MAX_TX_DESC_PREFETCH 0x0100001F   /* GRAN=1, PTHRESH=31 */
+/* Enable the counting of descriptors still to be processed. */
+#define E1000_TXDCTL_COUNT_DESC        0x00400000
 
 /* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
+#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) */
+#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 */
 /*
  * (RAR[15]) for our directed address used by controllers with
  * manageability enabled, allowing us room for 15 multicast addresses.
  */
-#define E1000_RAR_ENTRIES     15
-#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-#define E1000_RAL_MAC_ADDR_LEN 4
-#define E1000_RAH_MAC_ADDR_LEN 2
+#define E1000_RAR_ENTRIES      15
+#define E1000_RAH_AV           0x80000000      /* Receive descriptor valid */
+#define E1000_RAL_MAC_ADDR_LEN 4
+#define E1000_RAH_MAC_ADDR_LEN 2
+#define E1000_RAH_POOL_MASK    0x03FC0000
+#define E1000_RAH_POOL_SHIFT   18
+#define E1000_RAH_POOL_1       0x00040000
 
 /* 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
+#define E1000_ERR_NVM                  1
+#define E1000_ERR_PHY                  2
+#define E1000_ERR_CONFIG               3
+#define E1000_ERR_PARAM                        4
+#define E1000_ERR_MAC_INIT             5
+#define E1000_ERR_PHY_TYPE             6
+#define E1000_ERR_RESET                        9
+#define E1000_ERR_MASTER_REQUESTS_PENDING      10
+#define E1000_ERR_HOST_INTERFACE_COMMAND       11
+#define E1000_BLK_PHY_RESET            12
+#define E1000_ERR_SWFW_SYNC            13
+#define E1000_NOT_IMPLEMENTED          14
+#define E1000_ERR_MBX                  15
+#define E1000_ERR_INVALID_ARGUMENT     16
+#define E1000_ERR_NO_SPACE             17
+#define E1000_ERR_NVM_PBA_SECTION      18
+#define E1000_ERR_INVM_VALUE_NOT_FOUND 20
 
 /* 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
+#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
+#define MASTER_DISABLE_TIMEOUT         800
 /* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
+#define PHY_CFG_TIMEOUT                        100
 /* Number of 2 milliseconds we wait for acquiring MDIO ownership. */
-#define MDIO_OWNERSHIP_TIMEOUT      10
+#define MDIO_OWNERSHIP_TIMEOUT         10
 /* Number of milliseconds for NVM auto read done after MAC reset. */
-#define AUTO_READ_DONE_TIMEOUT      10
+#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 */
+#define E1000_FCRTH_RTH                0x0000FFF8      /* Mask Bits[15:3] for RTH */
+#define E1000_FCRTH_XFCE       0x80000000      /* External Flow Control Enable */
+#define E1000_FCRTL_RTL                0x0000FFF8      /* Mask Bits[15:3] for RTL */
+#define E1000_FCRTL_XONE       0x80000000      /* Enable XON frame transmission */
 
 /* Transmit Configuration Word */
-#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-#define E1000_TXCW_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 */
+#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_IV         0x08000000        /* Receive config invalid */
-#define E1000_RXCW_C          0x20000000        /* Receive config */
-#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
+#define E1000_RXCW_CW          0x0000ffff      /* RxConfigWord mask */
+#define E1000_RXCW_NC          0x04000000      /* Receive config no carrier */
+#define E1000_RXCW_IV          0x08000000      /* Receive config invalid */
+#define E1000_RXCW_CC          0x10000000      /* Receive config change */
+#define E1000_RXCW_C           0x20000000      /* Receive config */
+#define E1000_RXCW_SYNCH       0x40000000      /* Receive config synch */
+#define E1000_RXCW_ANC         0x80000000      /* Auto-neg complete */
+
+#define E1000_TSYNCTXCTL_VALID         0x00000001      /* Tx timestamp valid */
+#define E1000_TSYNCTXCTL_ENABLED       0x00000010      /* enable Tx timestamping */
+
+#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 timestamping */
+
+#define E1000_TSYNCRXCFG_PTP_V1_CTRLT_MASK             0x000000FF
+#define E1000_TSYNCRXCFG_PTP_V1_SYNC_MESSAGE           0x00
+#define E1000_TSYNCRXCFG_PTP_V1_DELAY_REQ_MESSAGE      0x01
+#define E1000_TSYNCRXCFG_PTP_V1_FOLLOWUP_MESSAGE       0x02
+#define E1000_TSYNCRXCFG_PTP_V1_DELAY_RESP_MESSAGE     0x03
+#define E1000_TSYNCRXCFG_PTP_V1_MANAGEMENT_MESSAGE     0x04
+
+#define E1000_TSYNCRXCFG_PTP_V2_MSGID_MASK             0x00000F00
+#define E1000_TSYNCRXCFG_PTP_V2_SYNC_MESSAGE           0x0000
+#define E1000_TSYNCRXCFG_PTP_V2_DELAY_REQ_MESSAGE      0x0100
+#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_REQ_MESSAGE 0x0200
+#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_RESP_MESSAGE        0x0300
+#define E1000_TSYNCRXCFG_PTP_V2_FOLLOWUP_MESSAGE       0x0800
+#define E1000_TSYNCRXCFG_PTP_V2_DELAY_RESP_MESSAGE     0x0900
+#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_FOLLOWUP_MESSAGE 0x0A00
+#define E1000_TSYNCRXCFG_PTP_V2_ANNOUNCE_MESSAGE       0x0B00
+#define E1000_TSYNCRXCFG_PTP_V2_SIGNALLING_MESSAGE     0x0C00
+#define E1000_TSYNCRXCFG_PTP_V2_MANAGEMENT_MESSAGE     0x0D00
+
+#define E1000_TIMINCA_16NS_SHIFT       24
 
 /* PCI Express Control */
-#define E1000_GCR_RXD_NO_SNOOP          0x00000001
-#define E1000_GCR_RXDSCW_NO_SNOOP       0x00000002
-#define E1000_GCR_RXDSCR_NO_SNOOP       0x00000004
-#define E1000_GCR_TXD_NO_SNOOP          0x00000008
-#define E1000_GCR_TXDSCW_NO_SNOOP       0x00000010
-#define E1000_GCR_TXDSCR_NO_SNOOP       0x00000020
-
-#define 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)
+#define E1000_GCR_RXD_NO_SNOOP         0x00000001
+#define E1000_GCR_RXDSCW_NO_SNOOP      0x00000002
+#define E1000_GCR_RXDSCR_NO_SNOOP      0x00000004
+#define E1000_GCR_TXD_NO_SNOOP         0x00000008
+#define E1000_GCR_TXDSCW_NO_SNOOP      0x00000010
+#define E1000_GCR_TXDSCR_NO_SNOOP      0x00000020
+#define E1000_GCR_CMPL_TMOUT_MASK      0x0000F000
+#define E1000_GCR_CMPL_TMOUT_10ms      0x00001000
+#define E1000_GCR_CMPL_TMOUT_RESEND    0x00010000
+#define E1000_GCR_CAP_VER2             0x00040000
+
+#define PCIE_NO_SNOOP_ALL      (E1000_GCR_RXD_NO_SNOOP | \
+                                E1000_GCR_RXDSCW_NO_SNOOP | \
+                                E1000_GCR_RXDSCR_NO_SNOOP | \
+                                E1000_GCR_TXD_NO_SNOOP    | \
+                                E1000_GCR_TXDSCW_NO_SNOOP | \
+                                E1000_GCR_TXDSCR_NO_SNOOP)
 
 /* PHY Control Register */
-#define MII_CR_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
+#define MII_CR_SPEED_SELECT_MSB        0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
+#define MII_CR_COLL_TEST_ENABLE        0x0080  /* Collision test enable */
+#define MII_CR_FULL_DUPLEX     0x0100  /* FDX =1, half duplex =0 */
+#define MII_CR_RESTART_AUTO_NEG        0x0200  /* Restart auto negotiation */
+#define MII_CR_ISOLATE         0x0400  /* Isolate PHY from MII */
+#define MII_CR_POWER_DOWN      0x0800  /* Power down */
+#define MII_CR_AUTO_NEG_EN     0x1000  /* Auto Neg Enable */
+#define MII_CR_SPEED_SELECT_LSB        0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
+#define MII_CR_LOOPBACK                0x4000  /* 0 = normal, 1 = loopback */
+#define MII_CR_RESET           0x8000  /* 0 = normal, 1 = PHY reset */
+#define MII_CR_SPEED_1000      0x0040
+#define MII_CR_SPEED_100       0x2000
+#define MII_CR_SPEED_10                0x0000
 
 /* PHY Status Register */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
+#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_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 */
+#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_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
+#define NWAY_LPAR_SELECTOR_FIELD       0x0000  /* LP protocol selector field */
+#define NWAY_LPAR_10T_HD_CAPS          0x0020  /* LP 10T Half Dplx Capable */
+#define NWAY_LPAR_10T_FD_CAPS          0x0040  /* LP 10T Full Dplx Capable */
+#define NWAY_LPAR_100TX_HD_CAPS                0x0080  /* LP 100TX Half Dplx Capable */
+#define NWAY_LPAR_100TX_FD_CAPS                0x0100  /* LP 100TX Full Dplx 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 Asym Pause Direction bit */
+#define NWAY_LPAR_REMOTE_FAULT         0x2000  /* LP detected Remote Fault */
+#define NWAY_LPAR_ACKNOWLEDGE          0x4000  /* LP 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_LP_NWAY_CAPS           0x0001  /* LP has Auto Neg Capability */
+#define NWAY_ER_PAGE_RXD               0x0002  /* LP 10T Half Dplx Capable */
+#define NWAY_ER_NEXT_PAGE_CAPS         0x0004  /* LP 10T Full Dplx Capable */
+#define NWAY_ER_LP_NEXT_PAGE_CAPS      0x0008  /* LP 100TX Half Dplx Capable */
+#define NWAY_ER_PAR_DETECT_FAULT       0x0010  /* LP 100TX Full Dplx Capable */
 
 /* 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 */
+#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  */
+/* 1=Repeater/switch device port 0=DTE device */
+#define CR_1000T_REPEATER_DTE  0x0400
+/* 1=Configure PHY as Master 0=Configure PHY as Slave */
+#define CR_1000T_MS_VALUE      0x0800
+/* 1=Master/Slave manual config value 0=Automatic Master/Slave config */
+#define CR_1000T_MS_ENABLE     0x1000
+#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_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
+#define SR_1000T_IDLE_ERROR_CNT                0x00FF  /* Num idle err since last rd */
+#define SR_1000T_ASYM_PAUSE_DIR                0x0100  /* LP asym 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 Master, 0=Slave */
+#define SR_1000T_MS_CONFIG_FAULT       0x8000  /* Master/Slave config fault */
 
+#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT  5
 
 /* PHY 1000 MII Register/Bit Definitions */
 /* PHY Registers defined by IEEE */
-#define PHY_CONTROL      0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Register */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_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 */
+#define PHY_CONTROL            0x00    /* Control Register */
+#define PHY_STATUS             0x01    /* Status Register */
+#define PHY_ID1                        0x02    /* Phy Id Reg (word 1) */
+#define PHY_ID2                        0x03    /* Phy Id Reg (word 2) */
+#define PHY_AUTONEG_ADV                0x04    /* Autoneg Advertisement */
+#define PHY_LP_ABILITY         0x05    /* Link Partner Ability (Base Page) */
+#define PHY_AUTONEG_EXP                0x06    /* Autoneg Expansion Reg */
+#define PHY_NEXT_PAGE_TX       0x07    /* Next Page Tx */
+#define PHY_LP_NEXT_PAGE       0x08    /* Link Partner Next Page */
+#define PHY_1000T_CTRL         0x09    /* 1000Base-T Control Reg */
+#define PHY_1000T_STATUS       0x0A    /* 1000Base-T Status Reg */
+#define PHY_EXT_STATUS         0x0F    /* Extended Status Reg */
+
+#define PHY_CONTROL_LB         0x4000  /* PHY Loopback bit */
 
 /* NVM Control */
-#define E1000_EECD_SK        0x00000001 /* NVM Clock */
-#define E1000_EECD_CS        0x00000002 /* NVM Chip Select */
-#define E1000_EECD_DI        0x00000004 /* NVM Data In */
-#define E1000_EECD_DO        0x00000008 /* NVM Data Out */
-#define E1000_EECD_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
+#define E1000_EECD_SK          0x00000001      /* NVM Clock */
+#define E1000_EECD_CS          0x00000002      /* NVM Chip Select */
+#define E1000_EECD_DI          0x00000004      /* NVM Data In */
+#define E1000_EECD_DO          0x00000008      /* NVM Data Out */
+#define E1000_EECD_FWE_MASK    0x00000030
+#define E1000_EECD_FWE_DIS     0x00000010      /* Disable FLASH writes */
+#define E1000_EECD_FWE_EN      0x00000020      /* Enable FLASH writes */
+#define E1000_EECD_FWE_SHIFT   4
+#define E1000_EECD_REQ         0x00000040      /* NVM Access Request */
+#define E1000_EECD_GNT         0x00000080      /* NVM Access Grant */
+#define E1000_EECD_PRES                0x00000100      /* NVM Present */
+#define E1000_EECD_SIZE                0x00000200      /* NVM Size (0=64 word 1=256 word) */
+#define E1000_EECD_BLOCKED     0x00008000      /* Bit banging access blocked flag */
+#define E1000_EECD_ABORT       0x00010000      /* NVM operation aborted flag */
+#define E1000_EECD_TIMEOUT     0x00020000      /* NVM read operation timeout flag */
+#define E1000_EECD_ERROR_CLR   0x00040000      /* NVM error status clear bit */
+/* NVM Addressing bits based on type 0=small, 1=large */
+#define E1000_EECD_ADDR_BITS   0x00000400
+#define E1000_EECD_TYPE                0x00002000      /* NVM Type (1-SPI, 0-Microwire) */
+#define E1000_NVM_GRANT_ATTEMPTS       1000    /* NVM # attempts to gain grant */
+#define E1000_EECD_AUTO_RD             0x00000200      /* NVM Auto Read done */
+#define E1000_EECD_SIZE_EX_MASK                0x00007800      /* NVM Size */
+#define E1000_EECD_SIZE_EX_SHIFT       11
+#define E1000_EECD_NVADDS              0x00018000      /* NVM Address Size */
+#define E1000_EECD_SELSHAD             0x00020000      /* Select Shadow RAM */
+#define E1000_EECD_INITSRAM            0x00040000      /* Initialize Shadow RAM */
+#define E1000_EECD_FLUPD               0x00080000      /* Update FLASH */
+#define E1000_EECD_AUPDEN              0x00100000      /* Ena Auto FLASH update */
+#define E1000_EECD_SHADV               0x00200000      /* Shadow RAM Data Valid */
+#define E1000_EECD_SEC1VAL             0x00400000      /* Sector One Valid */
+#define E1000_EECD_SECVAL_SHIFT                22
+#define E1000_EECD_SEC1VAL_VALID_MASK  (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
+
+#define E1000_NVM_SWDPIN0      0x0001  /* SWDPIN 0 NVM Value */
+#define E1000_NVM_LED_LOGIC    0x0020  /* Led Logic Word */
+#define E1000_NVM_RW_REG_DATA  16      /* Offset to data in NVM read/write regs */
+#define E1000_NVM_RW_REG_DONE  2       /* Offset to READ/WRITE done bit */
+#define E1000_NVM_RW_REG_START 1       /* Start operation */
+#define E1000_NVM_RW_ADDR_SHIFT        2       /* Shift to the address bits */
+#define E1000_NVM_POLL_WRITE   1       /* Flag for polling for write complete */
+#define E1000_NVM_POLL_READ    0       /* Flag for polling for read complete */
+#define E1000_FLASH_UPDATES    2000
 
 /* NVM Word Offsets */
-#define NVM_COMPAT                 0x0003
-#define NVM_ID_LED_SETTINGS        0x0004
-#define NVM_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 */
+#define NVM_COMPAT                     0x0003
+#define NVM_ID_LED_SETTINGS            0x0004
+#define NVM_VERSION                    0x0005
+#define NVM_SERDES_AMPLITUDE           0x0006  /* SERDES output amplitude */
+#define NVM_PHY_CLASS_WORD             0x0007
+
+#define NVM_INIT_CONTROL1_REG          0x000A
+#define NVM_INIT_CONTROL2_REG          0x000F
+#define NVM_SWDEF_PINS_CTRL_PORT_1     0x0010
+#define NVM_INIT_CONTROL3_PORT_B       0x0014
+#define NVM_INIT_3GIO_3                        0x001A
+#define NVM_SWDEF_PINS_CTRL_PORT_0     0x0020
+#define NVM_INIT_CONTROL3_PORT_A       0x0024
+#define NVM_CFG                                0x0012
+#define NVM_FLASH_VERSION              0x0032
+#define NVM_ALT_MAC_ADDR_PTR           0x0037
+#define NVM_CHECKSUM_REG               0x003F
+
+#define E1000_NVM_CFG_DONE_PORT_0      0x040000        /* MNG config cycle done */
+#define E1000_NVM_CFG_DONE_PORT_1      0x080000        /* ...for second port */
 
 /* Mask bits for fields in Word 0x0f of the NVM */
-#define NVM_WORD0F_PAUSE_MASK       0x3000
-#define NVM_WORD0F_PAUSE            0x1000
-#define NVM_WORD0F_ASM_DIR          0x2000
+#define NVM_WORD0F_PAUSE_MASK          0x3000
+#define NVM_WORD0F_PAUSE               0x1000
+#define NVM_WORD0F_ASM_DIR             0x2000
+#define NVM_WORD0F_ANE                 0x0800
+#define NVM_WORD0F_SWPDIO_EXT_MASK     0x00F0
+#define NVM_WORD0F_LPLU                        0x0001
 
 /* Mask bits for fields in Word 0x1a of the NVM */
-#define NVM_WORD1A_ASPM_MASK  0x000C
+#define NVM_WORD1A_ASPM_MASK           0x000C
 
 /* Mask bits for fields in Word 0x03 of the EEPROM */
-#define NVM_COMPAT_LOM    0x0800
+#define NVM_COMPAT_LOM                 0x0800
 
 /* length of string needed to store PBA number */
-#define E1000_PBANUM_LENGTH             11
+#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
+#define NVM_SUM                                0xBABA
+
+#define NVM_MAC_ADDR_OFFSET            0
+#define NVM_PBA_OFFSET_0               8
+#define NVM_PBA_OFFSET_1               9
+#define NVM_PBA_PTR_GUARD              0xFAFA
+#define NVM_RESERVED_WORD              0xFFFF
+#define NVM_PHY_CLASS_A                        0x8000
+#define NVM_SERDES_AMPLITUDE_MASK      0x000F
+#define NVM_SIZE_MASK                  0x1C00
+#define NVM_SIZE_SHIFT                 10
+#define NVM_WORD_SIZE_BASE_SHIFT       6
+#define NVM_SWDPIO_EXT_SHIFT           4
 
 /* NVM Commands - SPI */
-#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
-#define NVM_READ_OPCODE_SPI        0x03 /* NVM read opcode */
-#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
-#define NVM_A8_OPCODE_SPI          0x08 /* opcode bit-3 = address bit-8 */
-#define NVM_WREN_OPCODE_SPI        0x06 /* NVM set Write Enable latch */
-#define NVM_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
+#define NVM_MAX_RETRY_SPI      5000    /* Max wait of 5ms, for RDY signal */
+#define NVM_READ_OPCODE_SPI    0x03    /* NVM read opcode */
+#define NVM_WRITE_OPCODE_SPI   0x02    /* NVM write opcode */
+#define NVM_A8_OPCODE_SPI      0x08    /* opcode bit-3 = address bit-8 */
+#define NVM_WREN_OPCODE_SPI    0x06    /* NVM set Write Enable latch */
+#define NVM_WRDI_OPCODE_SPI    0x04    /* NVM reset Write Enable latch */
+#define NVM_RDSR_OPCODE_SPI    0x05    /* NVM read Status register */
+#define NVM_WRSR_OPCODE_SPI    0x01    /* NVM write Status register */
 
 /* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
+#define NVM_STATUS_RDY_SPI     0x01
+#define NVM_STATUS_WEN_SPI     0x02
+#define NVM_STATUS_BP0_SPI     0x04
+#define NVM_STATUS_BP1_SPI     0x08
+#define NVM_STATUS_WPEN_SPI    0x80
 
 /* Word definitions for ID LED Settings */
-#define ID_LED_RESERVED_0000 0x0000
-#define ID_LED_RESERVED_FFFF 0xFFFF
-#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2  << 12) | \
-                             (ID_LED_OFF1_OFF2 <<  8) | \
-                             (ID_LED_DEF1_DEF2 <<  4) | \
-                             (ID_LED_DEF1_DEF2))
-#define ID_LED_DEF1_DEF2     0x1
-#define ID_LED_DEF1_ON2      0x2
-#define ID_LED_DEF1_OFF2     0x3
-#define ID_LED_ON1_DEF2      0x4
-#define ID_LED_ON1_ON2       0x5
-#define ID_LED_ON1_OFF2      0x6
-#define ID_LED_OFF1_DEF2     0x7
-#define ID_LED_OFF1_ON2      0x8
-#define ID_LED_OFF1_OFF2     0x9
-
-#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-#define IGP_ACTIVITY_LED_ENABLE 0x0300
-#define IGP_LED3_MODE           0x07000000
+#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
+#define PCI_HEADER_TYPE_REGISTER       0x0E
+#define PCIE_LINK_STATUS               0x12
+#define PCIE_DEVICE_CONTROL2           0x28
+
+#define PCI_HEADER_TYPE_MULTIFUNC      0x80
+#define PCIE_LINK_WIDTH_MASK           0x3F0
+#define PCIE_LINK_WIDTH_SHIFT          4
+#define PCIE_LINK_SPEED_MASK           0x0F
+#define PCIE_LINK_SPEED_2500           0x01
+#define PCIE_LINK_SPEED_5000           0x02
+#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 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
+#define M88E1000_E_PHY_ID      0x01410C50
+#define M88E1000_I_PHY_ID      0x01410C30
+#define M88E1011_I_PHY_ID      0x01410C20
+#define IGP01E1000_I_PHY_ID    0x02A80380
+#define M88E1011_I_REV_4       0x04
+#define M88E1111_I_PHY_ID      0x01410CC0
+#define GG82563_E_PHY_ID       0x01410CA0
+#define IGP03E1000_E_PHY_ID    0x02A80390
+#define IFE_E_PHY_ID           0x02A80330
+#define IFE_PLUS_E_PHY_ID      0x02A80320
+#define IFE_C_E_PHY_ID         0x02A80310
+#define BME1000_E_PHY_ID       0x01410CB0
+#define BME1000_E_PHY_ID_R2    0x01410CB1
+#define I82577_E_PHY_ID                0x01540050
+#define I82578_E_PHY_ID                0x004DD040
+#define I82579_E_PHY_ID                0x01540090
+#define I217_E_PHY_ID          0x015400A0
+#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 */
+#define M88E1000_PHY_SPEC_CTRL         0x10    /* PHY Specific Control Reg */
+#define M88E1000_PHY_SPEC_STATUS       0x11    /* PHY Specific Status Reg */
+#define M88E1000_INT_ENABLE            0x12    /* Interrupt Enable Reg */
+#define M88E1000_INT_STATUS            0x13    /* Interrupt Status Reg */
+#define M88E1000_EXT_PHY_SPEC_CTRL     0x14    /* Extended PHY Specific Cntrl */
+#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 pg number setting */
+#define M88E1000_PHY_GEN_CONTROL       0x1E    /* meaning depends on reg 29 */
+#define M88E1000_PHY_VCO_REG_BIT8      0x100   /* Bits 8 & 11 are adjusted for */
+#define M88E1000_PHY_VCO_REG_BIT11     0x800   /* improved BER performance */
 
 /* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_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 */
+#define M88E1000_PSCR_JABBER_DISABLE   0x0001  /* 1=Jabber Function disabled */
+#define M88E1000_PSCR_POLARITY_REVERSAL        0x0002  /* 1=Polarity Reverse enabled */
+#define M88E1000_PSCR_SQE_TEST         0x0004  /* 1=SQE Test enabled */
+/* 1=CLK125 low, 0=CLK125 toggling */
+#define M88E1000_PSCR_CLK125_DISABLE   0x0010
+/* MDI Crossover Mode bits 6:5 Manual MDI configuration */
+#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000
+#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
+#define M88E1000_PSCR_AUTO_X_1000T     0x0040
 /* Auto crossover enabled all speeds */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060
+#define M88E1000_PSCR_AUTO_X_MODE      0x0060
 /*
- * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold)
+ * 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 */
+#define M88E1000_PSCR_EN_10BT_EXT_DIST 0x0080
+/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
+#define M88E1000_PSCR_MII_5BIT_ENABLE  0x0100
+#define M88E1000_PSCR_SCRAMBLER_DISABLE        0x0200  /* 1=Scrambler disable */
+#define M88E1000_PSCR_FORCE_LINK_GOOD  0x0400  /* 1=Force link good */
+#define M88E1000_PSCR_ASSERT_CRS_ON_TX 0x0800  /* 1=Assert CRS on Tx */
 
 /* M88E1000 PHY Specific Status Register */
-#define M88E1000_PSSR_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
-
+#define M88E1000_PSSR_JABBER           0x0001  /* 1=Jabber */
+#define M88E1000_PSSR_REV_POLARITY     0x0002  /* 1=Polarity reversed */
+#define M88E1000_PSSR_DOWNSHIFT                0x0020  /* 1=Downshifted */
+#define M88E1000_PSSR_MDIX             0x0040  /* 1=MDIX; 0=MDI */
+/*
+ * 0 = <50M
+ * 1 = 50-80M
+ * 2 = 80-110M
+ * 3 = 110-140M
+ * 4 = >140M
+ */
+#define M88E1000_PSSR_CABLE_LENGTH     0x0380
+#define M88E1000_PSSR_LINK             0x0400  /* 1=Link up, 0=Link down */
+#define M88E1000_PSSR_SPD_DPLX_RESOLVED        0x0800  /* 1=Speed & Duplex resolved */
+#define M88E1000_PSSR_PAGE_RCVD                0x1000  /* 1=Page received */
+#define M88E1000_PSSR_DPLX             0x2000  /* 1=Duplex 0=Half Duplex */
+#define M88E1000_PSSR_SPEED            0xC000  /* Speed, bits 14:15 */
+#define M88E1000_PSSR_10MBS            0x0000  /* 00=10Mbs */
+#define M88E1000_PSSR_100MBS           0x4000  /* 01=100Mbs */
+#define M88E1000_PSSR_1000MBS          0x8000  /* 10=1000Mbs */
+
+#define M88E1000_PSSR_CABLE_LENGTH_SHIFT       7
+
+/* M88E1000 Extended PHY Specific Control Register */
+#define M88E1000_EPSCR_FIBER_LOOPBACK  0x4000  /* 1=Fiber loopback */
+/*
+ * 1 = Lost lock detect enabled.
+ * Will assert lost lock and bring
+ * link down if idle not seen
+ * within 1ms in 1000BASE-T
+ */
+#define M88E1000_EPSCR_DOWN_NO_IDLE    0x8000
 /*
  * Number of times we will attempt to autonegotiate before downshifting if we
  * are the master
  */
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_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_1X    0x0100
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
+#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 */
+
+/* M88E1111 Specific Registers */
+#define M88E1111_PHY_PAGE_SELECT1      0x16    /* for registers 0-28 */
+#define M88E1111_PHY_PAGE_SELECT2      0x1D    /* for registers 30-31 */
+
+/* M88E1111 page select register mask */
+#define M88E1111_PHY_PAGE_SELECT_MASK1 0xFF
+#define M88E1111_PHY_PAGE_SELECT_MASK2 0x3F
 
 /* 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
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00
+
+#define I82578_EPSCR_DOWNSHIFT_ENABLE          0x0020
+#define I82578_EPSCR_DOWNSHIFT_COUNTER_MASK    0x001C
 
 /* BME1000 PHY Specific Control Register */
-#define BME1000_PSCR_ENABLE_DOWNSHIFT   0x0800 /* 1 = enable downshift */
-
-
-#define PHY_PAGE_SHIFT 5
-#define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
-                           ((reg) & MAX_PHY_REG_ADDRESS))
+#define BME1000_PSCR_ENABLE_DOWNSHIFT  0x0800  /* 1 = enable downshift */
 
 /*
  * Bits...
  * 15-5: page
  * 4-0: register offset
  */
-#define GG82563_PAGE_SHIFT        5
-#define GG82563_REG(page, reg)    \
+#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
+#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 */
+#define GG82563_PHY_SPEC_CTRL          GG82563_REG(0, 16)      /* PHY Spec Cntrl */
+#define GG82563_PHY_SPEC_STATUS                GG82563_REG(0, 17)      /* PHY Spec Status */
+#define GG82563_PHY_INT_ENABLE         GG82563_REG(0, 18)      /* Interrupt Ena */
+#define GG82563_PHY_SPEC_STATUS_2      GG82563_REG(0, 19)      /* PHY Spec Stat2 */
+#define GG82563_PHY_RX_ERR_CNTR                GG82563_REG(0, 21)      /* Rx Err Counter */
+#define GG82563_PHY_PAGE_SELECT                GG82563_REG(0, 22)      /* Page Select */
+#define GG82563_PHY_SPEC_CTRL_2                GG82563_REG(0, 26)      /* PHY Spec Cntrl2 */
+#define GG82563_PHY_PAGE_SELECT_ALT    GG82563_REG(0, 29)      /* Alt Page Select */
+/* Test Clock Control (use reg. 29 to select) */
+#define GG82563_PHY_TEST_CLK_CTRL      GG82563_REG(0, 30)
+
+/* MAC Specific Control Register */
+#define GG82563_PHY_MAC_SPEC_CTRL      GG82563_REG(2, 21)
+#define GG82563_PHY_MAC_SPEC_CTRL_2    GG82563_REG(2, 26)      /* MAC Spec Ctrl 2 */
+
+#define GG82563_PHY_DSP_DISTANCE       GG82563_REG(5, 26)      /* DSP Distance */
 
 /* Page 193 - Port Control Registers */
-#define GG82563_PHY_KMRN_MODE_CTRL   \
-       GG82563_REG(193, 16) /* Kumeran Mode Control */
-#define GG82563_PHY_PWR_MGMT_CTRL       \
-       GG82563_REG(193, 20) /* Power Management Control */
+/* Kumeran Mode Control */
+#define GG82563_PHY_KMRN_MODE_CTRL     GG82563_REG(193, 16)
+#define GG82563_PHY_PORT_RESET         GG82563_REG(193, 17)    /* Port Reset */
+#define GG82563_PHY_REVISION_ID                GG82563_REG(193, 18)    /* Revision ID */
+#define GG82563_PHY_DEVICE_ID          GG82563_REG(193, 19)    /* Device ID */
+#define GG82563_PHY_PWR_MGMT_CTRL      GG82563_REG(193, 20)    /* Pwr Mgt Ctrl */
+/* Rate Adaptation Control */
+#define GG82563_PHY_RATE_ADAPT_CTRL    GG82563_REG(193, 25)
 
 /* Page 194 - KMRN Registers */
-#define GG82563_PHY_INBAND_CTRL         \
-       GG82563_REG(194, 18) /* Inband Control */
+/* FIFO's Control/Status */
+#define GG82563_PHY_KMRN_FIFO_CTRL_STAT        GG82563_REG(194, 16)
+#define GG82563_PHY_KMRN_CTRL          GG82563_REG(194, 17)    /* Control */
+#define GG82563_PHY_INBAND_CTRL                GG82563_REG(194, 18)    /* Inband Ctrl */
+#define GG82563_PHY_KMRN_DIAGNOSTIC    GG82563_REG(194, 19)    /* Diagnostic */
+#define GG82563_PHY_ACK_TIMEOUTS       GG82563_REG(194, 20)    /* Ack Timeouts */
+#define GG82563_PHY_ADV_ABILITY                GG82563_REG(194, 21)    /* Adver Ability */
+/* Link Partner Advertised Ability */
+#define GG82563_PHY_LINK_PARTNER_ADV_ABILITY   GG82563_REG(194, 23)
+#define GG82563_PHY_ADV_NEXT_PAGE      GG82563_REG(194, 24)    /* Adver Next Pg */
+/* Link Partner Advertised Next page */
+#define GG82563_PHY_LINK_PARTNER_ADV_NEXT_PAGE GG82563_REG(194, 25)
+#define GG82563_PHY_KMRN_MISC          GG82563_REG(194, 26)    /* Misc. */
 
 /* 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
+#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
 
 /* SerDes Control */
-#define E1000_GEN_POLL_TIMEOUT          640
+#define E1000_GEN_CTL_READY            0x80000000
+#define E1000_GEN_CTL_ADDRESS_SHIFT    8
+#define E1000_GEN_POLL_TIMEOUT         640
 
 #endif /* _E1000_DEFINES_H_ */
index a46f997895617aced098663956ff07cdf28acb2a..377f2ea4b28d51acfab58ae59e5dd6e94808926e 100644 (file)
 
 #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 "kcompat.h"
 #include "hw.h"
 
 struct e1000_info;
@@ -57,12 +53,15 @@ struct e1000_info;
 #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
 
+#ifndef CONFIG_E1000E_NAPI
+#define E1000_MAX_INTR 10
+
+#endif /* CONFIG_E1000E_NAPI */
 /* Tx/Rx descriptor defines */
 #define E1000_DEFAULT_TXD              256
 #define E1000_MAX_TXD                  4096
@@ -72,17 +71,17 @@ struct e1000_info;
 #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 */
+#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 */
+#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 E1000_RX_BUFFER_WRITE          16      /* Must be power of 2 */
 
 #define AUTO_ALL_MODES                 0
 #define E1000_EEPROM_APME              0x0400
@@ -94,70 +93,6 @@ struct e1000_info;
 
 #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
-
-#define E1000_ICH_FWSM_PCIM2PCI                0x01000000 /* ME PCIm-to-PCI active */
-#define E1000_ICH_FWSM_PCIM2PCI_COUNT  2000
-
 /* Time to wait before putting the device into D3 if there's no link (in ms). */
 #define LINK_TIMEOUT           100
 
@@ -165,7 +100,7 @@ struct e1000_info;
  * Count for polling __E1000_RESET condition every 10-20msec.
  * Experimentation has shown the reset can take approximately 210msec.
  */
-#define E1000_CHECK_RESET_COUNT                25
+#define E1000_CHECK_RESET_COUNT         25
 
 #define DEFAULT_RDTR                   0
 #define DEFAULT_RADV                   8
@@ -183,13 +118,13 @@ struct e1000_info;
         E1000_TXDCTL_COUNT_DESC |                             \
         (5 << 16) | /* wthresh must be +1 more than desired */\
         (1 << 8)  | /* hthresh */                             \
-        0x1f)       /* pthresh */
+        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                */
+        0x20)                  /* set hthresh                */
 
 #define E1000_TIDV_FPD (1 << 31)
 #define E1000_RDTR_FPD (1 << 31)
@@ -206,11 +141,12 @@ enum e1000_boards {
        board_ich10lan,
        board_pchlan,
        board_pch2lan,
+       board_pch_lpt,
 };
 
 struct e1000_ps_page {
        struct page *page;
-       u64 dma; /* must be u64 - written to hw */
+       u64 dma;                /* must be u64 - written to hw */
 };
 
 /*
@@ -241,10 +177,10 @@ struct e1000_buffer {
 
 struct e1000_ring {
        struct e1000_adapter *adapter;  /* back pointer to adapter */
-       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 */
+       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;
@@ -264,6 +200,7 @@ struct e1000_ring {
        struct sk_buff *rx_skb_top;
 };
 
+#ifdef SIOCGMIIPHY
 /* PHY register snapshot values */
 struct e1000_phy_regs {
        u16 bmcr;               /* basic mode control register    */
@@ -275,6 +212,7 @@ struct e1000_phy_regs {
        u16 stat1000;           /* 1000BASE-T status register     */
        u16 estatus;            /* extended status register       */
 };
+#endif
 
 /* board specific private data structure */
 struct e1000_adapter {
@@ -287,7 +225,11 @@ struct e1000_adapter {
 
        const struct e1000_info *ei;
 
+#ifdef HAVE_VLAN_RX_REGISTER
+       struct vlan_group *vlgrp;
+#else
        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+#endif
        u32 bd_number;
        u32 rx_buffer_len;
        u16 mng_vlan_id;
@@ -307,10 +249,12 @@ struct e1000_adapter {
        /*
         * Tx
         */
-       struct e1000_ring *tx_ring /* One per active queue */
-                                               ____cacheline_aligned_in_smp;
+       struct e1000_ring *tx_ring      /* One per active queue */
+        ____cacheline_aligned_in_smp;
 
+#ifdef CONFIG_E1000E_NAPI
        struct napi_struct napi;
+#endif
 
        unsigned int restart_queue;
        u32 txd_cmd;
@@ -341,8 +285,12 @@ struct e1000_adapter {
        /*
         * Rx
         */
+#ifdef CONFIG_E1000E_NAPI
        bool (*clean_rx) (struct e1000_ring *ring, int *work_done,
-                         int work_to_do) ____cacheline_aligned_in_smp;
+                         int work_to_do)____cacheline_aligned_in_smp;
+#else
+       bool (*clean_rx) (struct e1000_ring *ring)____cacheline_aligned_in_smp;
+#endif
        void (*alloc_rx_buf) (struct e1000_ring *ring, int cleaned_count,
                              gfp_t gfp);
        struct e1000_ring *rx_ring;
@@ -361,23 +309,33 @@ struct e1000_adapter {
 
        unsigned int rx_ps_pages;
        u16 rx_ps_bsize0;
+#ifndef CONFIG_E1000E_NAPI
+       u64 rx_dropped_backlog; /* count drops from rx int handler */
+#endif
        u32 max_frame_size;
        u32 min_frame_size;
 
        /* OS defined structs */
        struct net_device *netdev;
        struct pci_dev *pdev;
+#ifndef HAVE_NETDEV_STATS_IN_NETDEV
+       struct net_device_stats net_stats;
+#endif
 
        /* structs defined in e1000_hw.h */
        struct e1000_hw hw;
 
+#ifdef HAVE_NDO_GET_STATS64
        spinlock_t stats64_lock;
+#endif
        struct e1000_hw_stats stats;
        struct e1000_phy_info phy_info;
        struct e1000_phy_stats phy_stats;
 
+#ifdef SIOCGMIIPHY
        /* Snapshot of PHY registers */
        struct e1000_phy_regs phy_regs;
+#endif
 
        struct e1000_ring test_tx_ring;
        struct e1000_ring test_rx_ring;
@@ -396,13 +354,22 @@ struct e1000_adapter {
 
        bool fc_autoneg;
 
+#ifndef HAVE_ETHTOOL_SET_PHYS_ID
+       unsigned long led_status;
+
+#endif
        unsigned int flags;
        unsigned int flags2;
        struct work_struct downshift_task;
        struct work_struct update_phy_task;
+#ifndef HAVE_ETHTOOL_SET_PHYS_ID
+       struct work_struct led_blink_task;
+#endif
        struct work_struct print_hang_task;
+       u32 *config_space;
 
        bool idle_check;
+       int node;               /* store the node to allocate memory on */
        int phy_hang_count;
 
        u16 tx_ring_count;
@@ -410,15 +377,13 @@ struct e1000_adapter {
 };
 
 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;
+       enum e1000_mac_type mac;
+       unsigned int flags;
+       unsigned int flags2;
+       u32 pba;
+       u32 max_hw_frame_size;
+        s32(*get_variants) (struct e1000_adapter *);
+       void (*init_ops) (struct e1000_hw *);
 };
 
 /* hardware capability, feature, and workaround flags */
@@ -430,7 +395,7 @@ struct e1000_info {
 #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)
+/* reserved bit8 */
 #define FLAG_IS_ICH                       (1 << 9)
 #define FLAG_HAS_MSIX                     (1 << 10)
 #define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
@@ -450,7 +415,11 @@ struct e1000_info {
 #define FLAG_LSC_GIG_SPEED_DROP           (1 << 25)
 #define FLAG_SMART_POWER_DOWN             (1 << 26)
 #define FLAG_MSI_ENABLED                  (1 << 27)
+#ifndef HAVE_NDO_SET_FEATURES
+#define FLAG_RX_CSUM_ENABLED              (1 << 28)
+#else
 /* reserved (1 << 28) */
+#endif
 #define FLAG_TSO_FORCE                    (1 << 29)
 #define FLAG_RX_RESTART_NOW               (1 << 30)
 #define FLAG_MSI_TEST_FAILED              (1 << 31)
@@ -467,6 +436,7 @@ struct e1000_info {
 #define FLAG2_CHECK_PHY_HANG              (1 << 9)
 #define FLAG2_NO_DISABLE_RX               (1 << 10)
 #define FLAG2_PCIM2PCI_ARBITER_WA         (1 << 11)
+#define FLAG2_DFLT_CRC_STRIPPING          (1 << 12)
 
 #define E1000_RX_DESC_PS(R, i)     \
        (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -495,6 +465,12 @@ 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);
+#ifndef HAVE_ETHTOOL_SET_PHYS_ID
+extern void e1000e_led_blink_task(struct work_struct *work);
+#endif
+#ifdef ETHTOOL_OPS_COMPAT
+extern int ethtool_ioctl(struct ifreq *ifr);
+#endif
 
 extern int e1000e_up(struct e1000_adapter *adapter);
 extern void e1000e_down(struct e1000_adapter *adapter);
@@ -505,9 +481,12 @@ extern int e1000e_setup_rx_resources(struct e1000_ring *ring);
 extern int e1000e_setup_tx_resources(struct e1000_ring *ring);
 extern void e1000e_free_rx_resources(struct e1000_ring *ring);
 extern void e1000e_free_tx_resources(struct e1000_ring *ring);
-extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
-                                                    struct rtnl_link_stats64
-                                                    *stats);
+#ifdef HAVE_NDO_GET_STATS64
+extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev, struct rtnl_link_stats64
+                                                   *stats);
+#else /* HAVE_NDO_GET_STATS64 */
+extern void e1000e_update_stats(struct e1000_adapter *adapter);
+#endif /* HAVE_NDO_GET_STATS64 */
 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);
@@ -515,53 +494,40 @@ 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 void e1000_init_function_pointers_82571(struct e1000_hw *hw);
+extern void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw);
+extern void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw);
 
-extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
-                                        u32 pba_num_size);
+static inline s32 e1000e_commit_phy(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.commit)
+               return hw->phy.ops.commit(hw);
 
-extern s32  e1000e_commit_phy(struct e1000_hw *hw);
+       return 0;
+}
 
 extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
 
 extern bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
 extern void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state);
 
-extern void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw);
 extern void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                bool state);
+                                                        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 void e1000e_disable_gig_wol_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_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);
@@ -569,7 +535,7 @@ 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 s32 e1000e_setup_link_generic(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,
@@ -580,31 +546,23 @@ 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 e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset,
+                                    u32 value);
 extern void e1000e_reset_adaptive(struct e1000_hw *hw);
 extern void e1000e_update_adaptive(struct e1000_hw *hw);
 
 extern s32 e1000e_setup_copper_link(struct e1000_hw *hw);
-extern 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);
@@ -612,90 +570,63 @@ 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 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);
+                                      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);
-}
+       if (hw->phy.ops.reset)
+               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);
+       return 0;
 }
 
 static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
 {
-       return hw->phy.ops.read_reg(hw, offset, data);
+       if (hw->phy.ops.read_reg)
+               return hw->phy.ops.read_reg(hw, offset, data);
+
+       return 0;
 }
 
 static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
 {
-       return hw->phy.ops.write_reg(hw, offset, data);
+       if (hw->phy.ops.write_reg)
+               return hw->phy.ops.write_reg(hw, offset, data);
+
+       return 0;
 }
 
 static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
 {
-       return hw->phy.ops.get_cable_length(hw);
+       if (hw->phy.ops.get_cable_length)
+               return hw->phy.ops.get_cable_length(hw);
+
+       return 0;
 }
 
 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_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_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)
 {
@@ -715,38 +646,100 @@ 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)
+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)
+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);
-}
+       if (hw->phy.ops.get_info)
+               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);
+       return 0;
 }
 
-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);
+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);
 }
 
+#define er32(reg)      __er32(hw, E1000_##reg)
+
+/**
+ * __ew32_prepare - prepare to write to MAC CSR register on certain parts
+ * @hw: pointer to the HW structure
+ *
+ * When updating the MAC CSR registers, the Manageability Engine (ME) could
+ * be accessing the registers at the same time.  Normally, this is handled in
+ * h/w by an arbiter but on some parts there is a bug that acknowledges Host
+ * accesses later than it should which could result in the register to have
+ * an incorrect value.  Workaround this by checking the FWSM register which
+ * has bit 24 set while ME is accessing MAC CSR registers, wait if it is set
+ * and try again a number of times.
+ **/
+static inline s32 __ew32_prepare(struct e1000_hw *hw)
+{
+       s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;
+
+       while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)
+               udelay(50);
+
+       return i;
+}
+
 static inline void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val)
 {
+       if (hw->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+               __ew32_prepare(hw);
+
        writel(val, hw->hw_addr + reg);
 }
 
+#define ew32(reg, val) __ew32(hw, E1000_##reg, (val))
+
+#define e1e_flush()    er32(STATUS)
+
+#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
+       __ew32((a), (reg + ((offset) << 2)), (value)))
+
+#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
+       readl((a)->hw_addr + reg + ((offset) << 2)))
+
+static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
+{
+       return readw(hw->flash_address + reg);
+}
+
+static inline u32 __er32flash(struct e1000_hw *hw, unsigned long reg)
+{
+       return readl(hw->flash_address + reg);
+}
+
+static inline void __ew16flash(struct e1000_hw *hw, unsigned long reg, u16 val)
+{
+       writew(val, hw->flash_address + reg);
+}
+
+static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
+{
+       writel(val, hw->flash_address + reg);
+}
+
+#define er16flash(reg)         __er16flash(hw, (reg))
+#define er32flash(reg)         __er32flash(hw, (reg))
+#define ew16flash(reg, val)    __ew16flash(hw, (reg), (val))
+#define ew32flash(reg, val)    __ew32flash(hw, (reg), (val))
+
 #endif /* _E1000_H_ */
index 296416d0b5564ac9bc552195fbb3ba961f7a0018..74b95ce2eb9c6d88ad419fc0c021a2f011481bb1 100644 (file)
@@ -30,6 +30,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
+#ifdef SIOCETHTOOL
 #include <linux/ethtool.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
 #include "e1000.h"
+#ifndef HAVE_NETDEV_VLAN_FEATURES
+#include <linux/if_vlan.h>
+#endif
+#ifdef ETHTOOL_OPS_COMPAT
+#include "kcompat_ethtool.c"
+#endif
 
-enum {NETDEV_STATS, E1000_STATS};
+enum { NETDEV_STATS, E1000_STATS };
 
 struct e1000_stats {
        char stat_string[ETH_GSTRING_LEN];
@@ -52,11 +59,21 @@ struct e1000_stats {
                .type = E1000_STATS, \
                .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
                .stat_offset = offsetof(struct e1000_adapter, m) }
+#ifdef HAVE_NDO_GET_STATS64
 #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) }
+#elif defined(HAVE_NETDEV_STATS_IN_NETDEV)
+#define E1000_NETDEV_STAT(str, m) { \
+                       .stat_string = str, \
+                       .type = NETDEV_STATS, \
+                       .sizeof_stat = sizeof(((struct net_device *)0)->m), \
+                       .stat_offset = offsetof(struct net_device, m) }
+#else /* HAVE_NETDEV_STATS_IN_NETDEV */
+#define E1000_NETDEV_STAT(str, m)      E1000_STAT(str, net_##m)
+#endif /* HAVE_NETDEV_STATS_IN_NETDEV */
 
 static const struct e1000_stats e1000_gstrings_stats[] = {
        E1000_STAT("rx_packets", stats.gprc),
@@ -67,21 +84,47 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
        E1000_STAT("tx_broadcast", stats.bptc),
        E1000_STAT("rx_multicast", stats.mprc),
        E1000_STAT("tx_multicast", stats.mptc),
+#ifdef HAVE_NDO_GET_STATS64
        E1000_NETDEV_STAT("rx_errors", rx_errors),
        E1000_NETDEV_STAT("tx_errors", tx_errors),
+#else /* HAVE_NDO_GET_STATS64 */
+       E1000_NETDEV_STAT("rx_errors", stats.rx_errors),
+       E1000_NETDEV_STAT("tx_errors", stats.tx_errors),
+#endif /* HAVE_NDO_GET_STATS64 */
+#ifndef CONFIG_E1000E_NAPI
+       E1000_STAT("rx_dropped_backlog", rx_dropped_backlog),
+#endif
+#ifdef HAVE_NDO_GET_STATS64
        E1000_NETDEV_STAT("tx_dropped", tx_dropped),
+#else /* HAVE_NDO_GET_STATS64 */
+       E1000_NETDEV_STAT("tx_dropped", stats.tx_dropped),
+#endif /* HAVE_NDO_GET_STATS64 */
        E1000_STAT("multicast", stats.mprc),
        E1000_STAT("collisions", stats.colc),
+#ifdef HAVE_NDO_GET_STATS64
        E1000_NETDEV_STAT("rx_length_errors", rx_length_errors),
        E1000_NETDEV_STAT("rx_over_errors", rx_over_errors),
+#else /* HAVE_NDO_GET_STATS64 */
+       E1000_NETDEV_STAT("rx_length_errors", stats.rx_length_errors),
+       E1000_NETDEV_STAT("rx_over_errors", stats.rx_over_errors),
+#endif /* HAVE_NDO_GET_STATS64 */
        E1000_STAT("rx_crc_errors", stats.crcerrs),
+#ifdef HAVE_NDO_GET_STATS64
        E1000_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
+#else /* HAVE_NDO_GET_STATS64 */
+       E1000_NETDEV_STAT("rx_frame_errors", stats.rx_frame_errors),
+#endif /* HAVE_NDO_GET_STATS64 */
        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),
+#ifdef HAVE_NDO_GET_STATS64
        E1000_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
        E1000_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
+#else /* HAVE_NDO_GET_STATS64 */
+       E1000_NETDEV_STAT("tx_fifo_errors", stats.tx_fifo_errors),
+       E1000_NETDEV_STAT("tx_heartbeat_errors", stats.tx_heartbeat_errors),
+#endif /* HAVE_NDO_GET_STATS64 */
        E1000_STAT("tx_window_errors", stats.latecol),
        E1000_STAT("tx_abort_late_coll", stats.latecol),
        E1000_STAT("tx_deferred_ok", stats.dc),
@@ -117,6 +160,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
        "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,
@@ -133,8 +177,7 @@ static int e1000_get_settings(struct net_device *netdev,
                                   SUPPORTED_100baseT_Half |
                                   SUPPORTED_100baseT_Full |
                                   SUPPORTED_1000baseT_Full |
-                                  SUPPORTED_Autoneg |
-                                  SUPPORTED_TP);
+                                  SUPPORTED_Autoneg | SUPPORTED_TP);
                if (hw->phy.type == e1000_phy_ife)
                        ecmd->supported &= ~SUPPORTED_1000baseT_Full;
                ecmd->advertising = ADVERTISED_TP;
@@ -150,13 +193,11 @@ static int e1000_get_settings(struct net_device *netdev,
                ecmd->transceiver = XCVR_INTERNAL;
 
        } else {
-               ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_FIBRE |
-                                    SUPPORTED_Autoneg);
+               ecmd->supported = (SUPPORTED_1000baseT_Full |
+                                  SUPPORTED_FIBRE | SUPPORTED_Autoneg);
 
                ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
+                                    ADVERTISED_FIBRE | ADVERTISED_Autoneg);
 
                ecmd->port = PORT_FIBRE;
                ecmd->transceiver = XCVR_EXTERNAL;
@@ -191,14 +232,15 @@ static int e1000_get_settings(struct net_device *netdev,
        ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
                         hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
 
+#ifdef ETH_TP_MDI_X
        /* 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;
+               ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X : ETH_TP_MDI;
        else
                ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
 
+#endif /* ETH_TP_MDI_X */
        return 0;
 }
 
@@ -215,8 +257,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
 
        /* Fiber NICs only allow 1000 gbps Full duplex */
        if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
-           spd != SPEED_1000 &&
-           dplx != DUPLEX_FULL) {
+           spd != SPEED_1000 && dplx != DUPLEX_FULL) {
                goto err_inval;
        }
 
@@ -237,7 +278,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
                mac->autoneg = 1;
                adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
                break;
-       case SPEED_1000 + DUPLEX_HALF: /* not supported */
+       case SPEED_1000 + DUPLEX_HALF:  /* not supported */
        default:
                goto err_inval;
        }
@@ -258,9 +299,8 @@ static int e1000_set_settings(struct net_device *netdev,
         * 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");
+       if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw)) {
+               e_err("Cannot change link characteristics when SoL/IDER is active.\n");
                return -EINVAL;
        }
 
@@ -271,12 +311,10 @@ static int e1000_set_settings(struct net_device *netdev,
                hw->mac.autoneg = 1;
                if (hw->phy.media_type == e1000_media_type_fiber)
                        hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |
-                                                    ADVERTISED_FIBRE |
-                                                    ADVERTISED_Autoneg;
+                           ADVERTISED_FIBRE | ADVERTISED_Autoneg;
                else
                        hw->phy.autoneg_advertised = ecmd->advertising |
-                                                    ADVERTISED_TP |
-                                                    ADVERTISED_Autoneg;
+                           ADVERTISED_TP | ADVERTISED_Autoneg;
                ecmd->advertising = hw->phy.autoneg_advertised;
                if (adapter->fc_autoneg)
                        hw->fc.requested_mode = e1000_fc_default;
@@ -308,7 +346,7 @@ static void e1000_get_pauseparam(struct net_device *netdev,
        struct e1000_hw *hw = &adapter->hw;
 
        pause->autoneg =
-               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
+           (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
 
        if (hw->fc.current_mode == e1000_fc_rx_pause) {
                pause->rx_pause = 1;
@@ -368,6 +406,120 @@ out:
        return retval;
 }
 
+#ifndef HAVE_NDO_SET_FEATURES
+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;
+}
+
+#ifdef NETIF_F_TSO
+static int e1000_set_tso(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+#ifndef HAVE_NETDEV_VLAN_FEATURES
+       int i;
+       struct net_device *v_netdev;
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
+
+       if (data) {
+               netdev->features |= NETIF_F_TSO;
+#ifdef NETIF_F_TSO6
+               netdev->features |= NETIF_F_TSO6;
+#endif
+       } else {
+               netdev->features &= ~NETIF_F_TSO;
+#ifdef NETIF_F_TSO6
+               netdev->features &= ~NETIF_F_TSO6;
+#endif
+#ifndef HAVE_NETDEV_VLAN_FEATURES
+               /* disable TSO on all VLANs if they're present */
+               if (!adapter->vlgrp)
+                       goto tso_out;
+               for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+                       v_netdev = vlan_group_get_device(adapter->vlgrp, i);
+                       if (!v_netdev)
+                               continue;
+
+                       v_netdev->features &= ~NETIF_F_TSO;
+#ifdef NETIF_F_TSO6
+                       v_netdev->features &= ~NETIF_F_TSO6;
+#endif
+                       vlan_group_set_device(adapter->vlgrp, i, v_netdev);
+               }
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
+       }
+
+#ifndef HAVE_NETDEV_VLAN_FEATURES
+tso_out:
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
+       adapter->flags |= FLAG_TSO_FORCE;
+       return 0;
+}
+
+#endif /* NETIF_F_TSO */
+#if defined(ETHTOOL_SFLAGS) && (defined(NETIF_F_RXHASH) || !defined(HAVE_VLAN_RX_REGISTER))
+static int e1000e_set_flags(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       u32 supported = 0, changed = netdev->features ^ data;
+       int rc;
+
+#ifdef NETIF_F_RXHASH
+       supported |= ETH_FLAG_RXHASH;
+#endif
+#ifndef HAVE_VLAN_RX_REGISTER
+       supported |= ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN;
+#endif
+
+       rc = ethtool_op_set_flags(netdev, data, supported);
+
+       if (rc)
+               return rc;
+
+       if (changed & supported) {
+               if (netif_running(netdev))
+                       e1000e_reinit_locked(adapter);
+               else
+                       e1000e_reset(adapter);
+       }
+
+       return 0;
+}
+
+#endif /* ETHTOOL_SFLAGS */
+#endif /* HAVE_NDO_SET_FEATURES */
 static u32 e1000_get_msglevel(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -382,7 +534,7 @@ static void e1000_set_msglevel(struct net_device *netdev, u32 data)
 
 static int e1000_get_regs_len(struct net_device *netdev)
 {
-#define E1000_REGS_LEN 32 /* overestimate */
+#define E1000_REGS_LEN 32      /* overestimate */
        return E1000_REGS_LEN * sizeof(u32);
 }
 
@@ -393,51 +545,53 @@ static void e1000_get_regs(struct net_device *netdev,
        struct e1000_hw *hw = &adapter->hw;
        u32 *regs_buff = p;
        u16 phy_data;
+       u8 revision_id;
 
        memset(p, 0, E1000_REGS_LEN * sizeof(u32));
 
-       regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
-                       adapter->pdev->device;
+       pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id);
 
-       regs_buff[0]  = er32(CTRL);
-       regs_buff[1]  = er32(STATUS);
+       regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device;
 
-       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[0] = er32(CTRL);
+       regs_buff[1] = er32(STATUS);
 
-       regs_buff[7]  = er32(TCTL);
-       regs_buff[8]  = er32(TDLEN);
-       regs_buff[9]  = er32(TDH);
-       regs_buff[10] = er32(TDT);
+       regs_buff[2] = er32(RCTL);
+       regs_buff[3] = er32(RDLEN(0));
+       regs_buff[4] = er32(RDH(0));
+       regs_buff[5] = er32(RDT(0));
+       regs_buff[6] = er32(RDTR);
+
+       regs_buff[7] = er32(TCTL);
+       regs_buff[8] = er32(TDLEN(0));
+       regs_buff[9] = er32(TDH(0));
+       regs_buff[10] = er32(TDT(0));
        regs_buff[11] = er32(TIDV);
 
-       regs_buff[12] = adapter->hw.phy.type;  /* PHY type (IGP=1, M88=0) */
+       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) */
+               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 */
+               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[23] = regs_buff[13];  /* mdix mode */
        }
-       regs_buff[21] = 0; /* was idle_errors */
+       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 */
+       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)
@@ -466,7 +620,7 @@ static int e1000_get_eeprom(struct net_device *netdev,
        last_word = (eeprom->offset + eeprom->len - 1) >> 1;
 
        eeprom_buff = kmalloc(sizeof(u16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
+                             (last_word - first_word + 1), GFP_KERNEL);
        if (!eeprom_buff)
                return -ENOMEM;
 
@@ -477,7 +631,7 @@ static int e1000_get_eeprom(struct net_device *netdev,
        } else {
                for (i = 0; i < last_word - first_word + 1; i++) {
                        ret_val = e1000_read_nvm(hw, first_word + i, 1,
-                                                     &eeprom_buff[i]);
+                                                &eeprom_buff[i]);
                        if (ret_val)
                                break;
                }
@@ -515,12 +669,10 @@ static int e1000_set_eeprom(struct net_device *netdev,
        if (eeprom->len == 0)
                return -EOPNOTSUPP;
 
-       if (eeprom->magic != (adapter->pdev->vendor | (adapter->pdev->device << 16)))
+       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;
@@ -541,7 +693,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
                /* 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]);
+                                        &eeprom_buff[last_word - first_word]);
 
        if (ret_val)
                goto out;
@@ -567,8 +719,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
         */
        if ((first_word <= NVM_CHECKSUM_REG) ||
            (hw->mac.type == e1000_82583) ||
-           (hw->mac.type == e1000_82574) ||
-           (hw->mac.type == e1000_82573))
+           (hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82573))
                ret_val = e1000e_update_nvm_checksum(hw);
 
 out:
@@ -580,26 +731,23 @@ 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);
+       strlcpy(drvinfo->driver, e1000e_driver_name, sizeof(drvinfo->driver));
+       strlcpy(drvinfo->version, e1000e_driver_version,
+               sizeof(drvinfo->version));
 
        /*
         * 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);
+       snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                "%d.%d-%d",
+                (adapter->eeprom_vers & 0xF000) >> 12,
+                (adapter->eeprom_vers & 0x0FF0) >> 4,
+                (adapter->eeprom_vers & 0x000F));
+
+       strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
+               sizeof(drvinfo->bus_info));
        drvinfo->regdump_len = e1000_get_regs_len(netdev);
        drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
 }
@@ -723,15 +871,15 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
 {
        u32 pat, val;
        static const u32 test[] = {
-               0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+               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));
+                       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;
                }
@@ -746,13 +894,14 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
        __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));
+               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)) \
@@ -777,19 +926,20 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        u32 i;
        u32 toggle;
        u32 mask;
+       u32 wlock_mac = 0;
 
        /*
         * 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 */
+               /* there are several bits on newer hardware that are r/w */
        case e1000_82571:
        case e1000_82572:
        case e1000_80003es2lan:
                toggle = 0x7FFFF3FF;
                break;
-        default:
+       default:
                toggle = 0x7FFFF033;
                break;
        }
@@ -799,8 +949,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        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);
+               e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
+                    after, value);
                *data = 1;
                return 1;
        }
@@ -815,15 +965,15 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        }
 
        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_RDBAH(0), 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_RDLEN(0), 0x000FFF80, 0x000FFFFF);
+       REG_PATTERN_TEST(E1000_RDH(0), 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(E1000_RDT(0), 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_PATTERN_TEST(E1000_TDBAH(0), 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_TDLEN(0), 0x000FFF80, 0x000FFFFF);
 
        REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x00000000);
 
@@ -832,29 +982,41 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
 
        REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_RDBAL(0), 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_TDBAL(0), 0xFFFFFFF0, 0xFFFFFFFF);
        REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
        mask = 0x8003FFFF;
        switch (mac->type) {
        case e1000_ich10lan:
        case e1000_pchlan:
        case e1000_pch2lan:
+       case e1000_pch_lpt:
                mask |= (1 << 18);
                break;
        default:
                break;
        }
-       for (i = 0; i < mac->rar_entry_count; i++)
+
+       if (mac->type == e1000_pch_lpt)
+               wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>
+                   E1000_FWSM_WLOCK_MAC_SHIFT;
+
+       for (i = 0; i < mac->rar_entry_count; i++) {
+               /* Cannot test write-protected SHRAL[n] registers */
+               if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))
+                       continue;
+
                REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-                                      mask, 0xFFFFFFFF);
+                                      mask, 0xFFFFFFFF);
+       }
 
        for (i = 0; i < mac->mta_reg_count; i++)
                REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
 
        *data = 0;
+
        return 0;
 }
 
@@ -875,7 +1037,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
        }
 
        /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16) NVM_SUM) && !(*data))
+       if ((checksum != (u16)NVM_SUM) && !(*data))
                *data = 2;
 
        return *data;
@@ -883,7 +1045,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
 
 static irqreturn_t e1000_test_intr(int irq, void *data)
 {
-       struct net_device *netdev = (struct net_device *) data;
+       struct net_device *netdev = (struct net_device *)data;
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct e1000_hw *hw = &adapter->hw;
 
@@ -917,7 +1079,7 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
                         netdev)) {
                shared_int = 0;
        } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
-                netdev->name, netdev)) {
+                              netdev->name, netdev)) {
                *data = 1;
                ret_val = -1;
                goto out;
@@ -1035,10 +1197,10 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
        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);
+                               dma_unmap_single(pci_dev_to_dev(pdev),
+                                                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);
                }
@@ -1047,22 +1209,22 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
        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);
+                               dma_unmap_single(pci_dev_to_dev(pdev),
+                                                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);
+               dma_free_coherent(pci_dev_to_dev(pdev), 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);
+               dma_free_coherent(pci_dev_to_dev(pdev), rx_ring->size,
+                                 rx_ring->desc, rx_ring->dma);
                rx_ring->desc = NULL;
        }
 
@@ -1088,8 +1250,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                tx_ring->count = E1000_DEFAULT_TXD;
 
        tx_ring->buffer_info = kcalloc(tx_ring->count,
-                                      sizeof(struct e1000_buffer),
-                                      GFP_KERNEL);
+                                      sizeof(struct e1000_buffer), GFP_KERNEL);
        if (!tx_ring->buffer_info) {
                ret_val = 1;
                goto err_nomem;
@@ -1097,7 +1258,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
 
        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->desc = dma_alloc_coherent(pci_dev_to_dev(pdev), tx_ring->size,
                                           &tx_ring->dma, GFP_KERNEL);
        if (!tx_ring->desc) {
                ret_val = 2;
@@ -1106,11 +1267,11 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        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(TDBAL(0), ((u64)tx_ring->dma & 0x00000000FFFFFFFF));
+       ew32(TDBAH(0), ((u64)tx_ring->dma >> 32));
+       ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc));
+       ew32(TDH(0), 0);
+       ew32(TDT(0), 0);
        ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN | E1000_TCTL_MULR |
             E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
             E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
@@ -1129,9 +1290,9 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                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,
+                   dma_map_single(pci_dev_to_dev(pdev), skb->data, skb->len,
+                                  DMA_TO_DEVICE);
+               if (dma_mapping_error(pci_dev_to_dev(pdev),
                                      tx_ring->buffer_info[i].dma)) {
                        ret_val = 4;
                        goto err_nomem;
@@ -1150,15 +1311,14 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                rx_ring->count = E1000_DEFAULT_RXD;
 
        rx_ring->buffer_info = kcalloc(rx_ring->count,
-                                      sizeof(struct e1000_buffer),
-                                      GFP_KERNEL);
+                                      sizeof(struct e1000_buffer), GFP_KERNEL);
        if (!rx_ring->buffer_info) {
                ret_val = 5;
                goto err_nomem;
        }
 
        rx_ring->size = rx_ring->count * sizeof(union e1000_rx_desc_extended);
-       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
+       rx_ring->desc = dma_alloc_coherent(pci_dev_to_dev(pdev), rx_ring->size,
                                           &rx_ring->dma, GFP_KERNEL);
        if (!rx_ring->desc) {
                ret_val = 6;
@@ -1170,16 +1330,16 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        rctl = er32(RCTL);
        if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX))
                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);
+       ew32(RDBAL(0), ((u64)rx_ring->dma & 0xFFFFFFFF));
+       ew32(RDBAH(0), ((u64)rx_ring->dma >> 32));
+       ew32(RDLEN(0), rx_ring->size);
+       ew32(RDH(0), 0);
+       ew32(RDT(0), 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);
+           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++) {
@@ -1194,9 +1354,9 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
                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,
+                   dma_map_single(pci_dev_to_dev(pdev), skb->data, 2048,
+                                  DMA_FROM_DEVICE);
+               if (dma_mapping_error(pci_dev_to_dev(pdev),
                                      rx_ring->buffer_info[i].dma)) {
                        ret_val = 8;
                        goto err_nomem;
@@ -1238,11 +1398,11 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
                /* 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 */
+               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();
@@ -1305,7 +1465,6 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                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:
@@ -1318,18 +1477,18 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 
        /* 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 */
+       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 */
+               ctrl_reg |= E1000_CTRL_ILOS;    /* Invert Loss of Signal */
        } else {
                /*
                 * Set the ILOS bit on the fiber Nic if half duplex link is
@@ -1519,7 +1678,7 @@ static int e1000_check_lbtest_frame(struct sk_buff *skb,
        frame_size &= ~1;
        if (*(skb->data + 3) == 0xFF)
                if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                  (*(skb->data + frame_size / 2 + 12) == 0xAF))
+                   (*(skb->data + frame_size / 2 + 12) == 0xAF))
                        return 0;
        return 13;
 }
@@ -1536,7 +1695,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
        int ret_val = 0;
        unsigned long time;
 
-       ew32(RDT, rx_ring->count - 1);
+       ew32(RDT(0), rx_ring->count - 1);
 
        /*
         * Calculate the loop count based on the largest descriptor ring
@@ -1551,30 +1710,31 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
 
        k = 0;
        l = 0;
-       for (j = 0; j <= lc; j++) { /* loop count loop */
-               for (i = 0; i < 64; i++) { /* send the packets */
+       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);
+                       dma_sync_single_for_device(pci_dev_to_dev(pdev),
+                                                  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);
+               ew32(TDT(0), k);
                e1e_flush();
                msleep(200);
-               time = jiffies; /* set the start time for the receive */
+               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);
+               do {            /* receive the sent packets */
+                       dma_sync_single_for_cpu(pci_dev_to_dev(pdev),
+                                               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++;
@@ -1587,24 +1747,26 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter)
                         */
                } while ((good_cnt < 64) && !time_after(jiffies, time + 20));
                if (good_cnt != 64) {
-                       ret_val = 13; /* ret_val is the same as mis-compare */
+                       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 */
+                       ret_val = 14;   /* error code for time out error */
                        break;
                }
-       } /* end loop count loop */
+       }                       /* end loop count loop */
        return ret_val;
 }
 
 static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
 {
+       struct e1000_hw *hw = &adapter->hw;
+
        /*
         * PHY loopback cannot be performed if SoL/IDER
         * sessions are active
         */
-       if (e1000_check_reset_block(&adapter->hw)) {
+       if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw)) {
                e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
                *data = 0;
                goto out;
@@ -1663,6 +1825,7 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
        return *data;
 }
 
+#ifdef HAVE_ETHTOOL_GET_SSET_COUNT
 static int e1000e_get_sset_count(struct net_device *netdev, int sset)
 {
        switch (sset) {
@@ -1674,6 +1837,17 @@ static int e1000e_get_sset_count(struct net_device *netdev, int sset)
                return -EOPNOTSUPP;
        }
 }
+#else
+static int e1000_get_self_test_count(struct net_device *netdev)
+{
+       return E1000_TEST_LEN;
+}
+
+static int e1000_get_stats_count(struct net_device *netdev)
+{
+       return E1000_STATS_LEN;
+}
+#endif
 
 static void e1000_diag_test(struct net_device *netdev,
                            struct ethtool_test *eth_test, u64 *data)
@@ -1791,8 +1965,7 @@ static void e1000_get_wol(struct net_device *netdev,
                wol->supported &= ~WAKE_UCAST;
 
                if (adapter->wol & E1000_WUFC_EX)
-                       e_err("Interface does not support directed (unicast) "
-                             "frame wake-up packets\n");
+                       e_err("Interface does not support directed (unicast) frame wake-up packets\n");
        }
 
        if (adapter->wol & E1000_WUFC_EX)
@@ -1836,6 +2009,7 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
        return 0;
 }
 
+#ifdef HAVE_ETHTOOL_SET_PHYS_ID
 static int e1000_set_phys_id(struct net_device *netdev,
                             enum ethtool_phys_id_state state)
 {
@@ -1867,6 +2041,69 @@ static int e1000_set_phys_id(struct net_device *netdev,
        }
        return 0;
 }
+#else /* HAVE_ETHTOOL_SET_PHYS_ID */
+/* toggle LED 4 times per second = 2 "blinks" per second */
+#define E1000_ID_INTERVAL      (HZ/4)
+
+/* bit defines for adapter->led_status */
+#define E1000_LED_ON           0
+
+void e1000e_led_blink_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                                    struct e1000_adapter,
+                                                    led_blink_task);
+
+       if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
+               adapter->hw.mac.ops.led_off(&adapter->hw);
+       else
+               adapter->hw.mac.ops.led_on(&adapter->hw);
+}
+
+static void e1000_led_blink_callback(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+
+       schedule_work(&adapter->led_blink_task);
+       mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
+}
+
+static int e1000_phys_id(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (!data)
+               data = INT_MAX;
+
+       if ((hw->phy.type == e1000_phy_ife) ||
+           (hw->mac.type == e1000_pchlan) ||
+           (hw->mac.type == e1000_pch2lan) ||
+           (hw->mac.type == e1000_pch_lpt) ||
+           (hw->mac.type == e1000_82583) || (hw->mac.type == e1000_82574)) {
+               if (!adapter->blink_timer.function) {
+                       init_timer(&adapter->blink_timer);
+                       adapter->blink_timer.function =
+                           e1000_led_blink_callback;
+                       adapter->blink_timer.data = (unsigned long)adapter;
+               }
+               mod_timer(&adapter->blink_timer, jiffies);
+               msleep_interruptible(data * 1000);
+               del_timer_sync(&adapter->blink_timer);
+               if (hw->phy.type == e1000_phy_ife)
+                       e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
+       } else {
+               e1000e_blink_led_generic(hw);
+               msleep_interruptible(data * 1000);
+       }
+
+       hw->mac.ops.led_off(hw);
+       clear_bit(E1000_LED_ON, &adapter->led_status);
+       hw->mac.ops.cleanup_led(hw);
+
+       return 0;
+}
+#endif /* HAVE_ETHTOOL_SET_PHYS_ID */
 
 static int e1000_get_coalesce(struct net_device *netdev,
                              struct ethtool_coalesce *ec)
@@ -1927,24 +2164,33 @@ static int e1000_nway_reset(struct net_device *netdev)
 }
 
 static void e1000_get_ethtool_stats(struct net_device *netdev,
-                                   struct ethtool_stats *stats,
-                                   u64 *data)
+                                   struct ethtool_stats *stats, u64 *data)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
+#ifdef HAVE_NDO_GET_STATS64
        struct rtnl_link_stats64 net_stats;
+#endif
        int i;
        char *p = NULL;
 
+#ifdef HAVE_NDO_GET_STATS64
        e1000e_get_stats64(netdev, &net_stats);
+#else
+       e1000e_update_stats(adapter);
+#endif
        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;
+#ifdef HAVE_NDO_GET_STATS64
+                       p = (char *)&net_stats +
+#else
+                       p = (char *)netdev +
+#endif
+                           e1000_gstrings_stats[i].stat_offset;
                        break;
                case E1000_STATS:
-                       p = (char *) adapter +
-                                       e1000_gstrings_stats[i].stat_offset;
+                       p = (char *)adapter +
+                           e1000_gstrings_stats[i].stat_offset;
                        break;
                default:
                        data[i] = 0;
@@ -1952,7 +2198,7 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
                }
 
                data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+                          sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
 }
 
@@ -1976,12 +2222,19 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
        }
 }
 
+#ifdef ETHTOOL_GRXRINGS
+#ifdef HAVE_ETHTOOL_GET_RXNFC_VOID_RULE_LOCS
 static int e1000_get_rxnfc(struct net_device *netdev,
                           struct ethtool_rxnfc *info, void *rule_locs)
+#else
+static int e1000_get_rxnfc(struct net_device *netdev,
+                          struct ethtool_rxnfc *info, u32 *rule_locs)
+#endif
 {
        info->data = 0;
 
        switch (info->cmd) {
+/* *INDENT-OFF* */
        case ETHTOOL_GRXFH: {
                struct e1000_adapter *adapter = netdev_priv(netdev);
                struct e1000_hw *hw = &adapter->hw;
@@ -2018,41 +2271,77 @@ static int e1000_get_rxnfc(struct net_device *netdev,
                }
                return 0;
        }
+/* *INDENT-ON* */
        default:
                return -EOPNOTSUPP;
        }
 }
+#endif /* ETHTOOL_GRXRINGS */
 
 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,
-       .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_rxnfc              = e1000_get_rxnfc,
+       .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,
+#ifndef HAVE_NDO_SET_FEATURES
+       .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,
+#ifdef NETIF_F_TSO
+       .get_tso = ethtool_op_get_tso,
+       .set_tso = e1000_set_tso,
+#endif
+#ifdef ETHTOOL_GFLAGS
+       .get_flags = ethtool_op_get_flags,
+#endif
+#if defined(ETHTOOL_SFLAGS) && (defined(NETIF_F_RXHASH) || !defined(HAVE_VLAN_RX_REGISTER))
+       .set_flags = e1000e_set_flags,
+#endif
+#endif /* HAVE_NDO_SET_FEATURES */
+       .self_test = e1000_diag_test,
+       .get_strings = e1000_get_strings,
+#ifdef HAVE_ETHTOOL_SET_PHYS_ID
+       .set_phys_id = e1000_set_phys_id,
+#else
+       .phys_id = e1000_phys_id,
+#endif
+       .get_ethtool_stats = e1000_get_ethtool_stats,
+#ifdef HAVE_ETHTOOL_GET_SSET_COUNT
+       .get_sset_count = e1000e_get_sset_count,
+#else
+       .self_test_count = e1000_get_self_test_count,
+       .get_stats_count = e1000_get_stats_count,
+#endif
+#ifdef HAVE_ETHTOOL_GET_PERM_ADDR
+       .get_perm_addr = ethtool_op_get_perm_addr,
+#endif
+       .get_coalesce = e1000_get_coalesce,
+       .set_coalesce = e1000_set_coalesce,
+#ifdef ETHTOOL_GRXRINGS
+       .get_rxnfc = e1000_get_rxnfc,
+#endif
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)
 {
-       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
+       /* have to "undeclare" const on this struct to remove warnings */
+       SET_ETHTOOL_OPS(netdev, (struct ethtool_ops *)&e1000_ethtool_ops);
 }
+#endif /* SIOCETHTOOL */
index 197059bb9abf1c00d23b63b693615dc1d6ef40e9..1d72d735747b5a7cfbf1fa4cb6796d32ab050bb4 100644 (file)
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
-#include <linux/types.h>
-
-struct e1000_hw;
-struct e1000_adapter;
-
+#include "regs.h"
 #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_MRQC     = 0x05818, /* Multiple Receive Control - RW */
-       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_RETA_BASE = 0x05C00, /* Redirection Table - RW */
-#define E1000_RETA(_n) (E1000_RETA_BASE + ((_n) * 4))
-       E1000_RSSRK_BASE = 0x05C80, /* RSS Random Key - RW */
-#define E1000_RSSRK(_n)        (E1000_RSSRK_BASE + ((_n) * 4))
-       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
+struct e1000_hw;
 
 #define E1000_DEV_ID_82571EB_COPPER            0x105E
 #define E1000_DEV_ID_82571EB_FIBER             0x105F
 #define E1000_DEV_ID_82571EB_SERDES            0x1060
+#define E1000_DEV_ID_82571EB_SERDES_DUAL       0x10D9
+#define E1000_DEV_ID_82571EB_SERDES_QUAD       0x10DA
 #define E1000_DEV_ID_82571EB_QUAD_COPPER       0x10A4
 #define E1000_DEV_ID_82571PT_QUAD_COPPER       0x10D5
 #define E1000_DEV_ID_82571EB_QUAD_FIBER                0x10A5
 #define E1000_DEV_ID_82571EB_QUAD_COPPER_LP    0x10BC
-#define E1000_DEV_ID_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
@@ -366,13 +52,11 @@ enum e1e_registers {
 #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_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
@@ -381,11 +65,11 @@ enum e1e_registers {
 #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_AMT            0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M_V              0x10CB
+#define E1000_DEV_ID_ICH9_IGP_AMT              0x10BD
+#define E1000_DEV_ID_ICH9_BM                   0x10E5
 #define E1000_DEV_ID_ICH9_IGP_C                        0x294C
 #define E1000_DEV_ID_ICH9_IFE                  0x10C0
 #define E1000_DEV_ID_ICH9_IFE_GT               0x10C3
@@ -396,21 +80,28 @@ enum e1e_registers {
 #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_DEV_ID_PCH_LPT_I217_LM           0x153A
+#define E1000_DEV_ID_PCH_LPT_I217_V            0x153B
+#define E1000_REVISION_0       0
+#define E1000_REVISION_1       1
+#define E1000_REVISION_3       3
+#define E1000_REVISION_4       4
 
-#define E1000_REVISION_4 4
-
-#define E1000_FUNC_1 1
+#define E1000_FUNC_0           0
+#define E1000_FUNC_1           1
 
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0      0
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1      3
 
 enum e1000_mac_type {
+       e1000_undefined = 0,
        e1000_82571,
        e1000_82572,
        e1000_82573,
@@ -422,6 +113,8 @@ enum e1000_mac_type {
        e1000_ich10lan,
        e1000_pchlan,
        e1000_pch2lan,
+       e1000_pch_lpt,
+       e1000_num_macs          /* List is 1-based, so subtract 1 for true count. */
 };
 
 enum e1000_media_type {
@@ -443,7 +136,7 @@ enum e1000_nvm_type {
 enum e1000_nvm_override {
        e1000_nvm_override_none = 0,
        e1000_nvm_override_spi_small,
-       e1000_nvm_override_spi_large
+       e1000_nvm_override_spi_large,
 };
 
 enum e1000_phy_type {
@@ -459,6 +152,27 @@ enum e1000_phy_type {
        e1000_phy_82578,
        e1000_phy_82577,
        e1000_phy_82579,
+       e1000_phy_i217,
+};
+
+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 {
@@ -466,6 +180,7 @@ enum e1000_bus_width {
        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
@@ -477,7 +192,7 @@ enum e1000_1000t_rx_status {
        e1000_1000t_rx_status_undefined = 0xFF
 };
 
-enum e1000_rev_polarity{
+enum e1000_rev_polarity {
        e1000_rev_polarity_normal = 0,
        e1000_rev_polarity_reversed,
        e1000_rev_polarity_undefined = 0xFF
@@ -511,16 +226,15 @@ enum e1000_serdes_link_state {
        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;
-};
-
+#ifndef __le16
+#define __le16 u16
+#endif
+#ifndef __le32
+#define __le32 u32
+#endif
+#ifndef __le64
+#define __le64 u64
+#endif
 /* Receive Descriptor - Extended */
 union e1000_rx_desc_extended {
        struct {
@@ -529,21 +243,21 @@ union e1000_rx_desc_extended {
        } read;
        struct {
                struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
+                       __le32 mrq;     /* Multiple Rx Queues */
                        union {
-                               __le32 rss;         /* RSS Hash */
+                               __le32 rss;     /* RSS Hash */
                                struct {
-                                       __le16 ip_id;  /* IP id */
-                                       __le16 csum;   /* Packet Checksum */
+                                       __le16 ip_id;   /* IP id */
+                                       __le16 csum;    /* Packet Checksum */
                                } csum_ip;
                        } hi_dword;
                } lower;
                struct {
-                       __le32 status_error;     /* ext status/error */
+                       __le32 status_error;    /* ext status/error */
                        __le16 length;
-                       __le16 vlan;         /* VLAN tag */
+                       __le16 vlan;    /* VLAN tag */
                } upper;
-       } wb;  /* writeback */
+       } wb;                   /* writeback */
 };
 
 #define MAX_PS_BUFFERS 4
@@ -555,35 +269,35 @@ union e1000_rx_desc_packet_split {
        } read;
        struct {
                struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
+                       __le32 mrq;     /* Multiple Rx Queues */
                        union {
-                               __le32 rss;           /* RSS Hash */
+                               __le32 rss;     /* RSS Hash */
                                struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
+                                       __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 */
+                       __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 */
+       } wb;                   /* writeback */
 };
 
 /* Transmit Descriptor */
 struct e1000_tx_desc {
-       __le64 buffer_addr;      /* Address of the descriptor's data buffer */
+       __le64 buffer_addr;     /* Address of the descriptor's data buffer */
        union {
                __le32 data;
                struct {
-                       __le16 length;    /* Data buffer length */
+                       __le16 length;  /* Data buffer length */
                        u8 cso; /* Checksum offset */
                        u8 cmd; /* Descriptor control */
                } flags;
@@ -591,7 +305,7 @@ struct e1000_tx_desc {
        union {
                __le32 data;
                struct {
-                       u8 status;     /* Descriptor status */
+                       u8 status;      /* Descriptor status */
                        u8 css; /* Checksum start */
                        __le16 special;
                } fields;
@@ -603,37 +317,37 @@ struct e1000_context_desc {
        union {
                __le32 ip_config;
                struct {
-                       u8 ipcss;      /* IP checksum start */
-                       u8 ipcso;      /* IP checksum offset */
-                       __le16 ipcse;     /* IP checksum end */
+                       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 */
+                       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 */
+                       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 */
+       __le64 buffer_addr;     /* Address of the descriptor's buffer address */
        union {
                __le32 data;
                struct {
-                       __le16 length;    /* Data buffer length */
+                       __le16 length;  /* Data buffer length */
                        u8 typ_len_ext;
                        u8 cmd;
                } flags;
@@ -641,9 +355,9 @@ struct e1000_data_desc {
        union {
                __le32 data;
                struct {
-                       u8 status;     /* Descriptor status */
-                       u8 popts;      /* Packet Options */
-                       __le16 special;   /* */
+                       u8 status;      /* Descriptor status */
+                       u8 popts;       /* Packet Options */
+                       __le16 special;
                } fields;
        } upper;
 };
@@ -713,6 +427,7 @@ struct e1000_hw_stats {
        u64 ictxqmtc;
        u64 icrxdmtc;
        u64 icrxoc;
+       u64 doosync;
 };
 
 struct e1000_phy_stats {
@@ -722,13 +437,13 @@ struct e1000_phy_stats {
 
 struct e1000_host_mng_dhcp_cookie {
        u32 signature;
-       u8  status;
-       u8  reserved0;
+       u8 status;
+       u8 reserved0;
        u16 vlan_id;
        u32 reserved1;
        u16 reserved2;
-       u8  reserved3;
-       u8  checksum;
+       u8 reserved3;
+       u8 checksum;
 };
 
 /* Host Interface "Rev 1" */
@@ -739,7 +454,7 @@ struct e1000_host_command_header {
        u8 checksum;
 };
 
-#define E1000_HI_MAX_DATA_LENGTH     252
+#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];
@@ -747,41 +462,57 @@ struct e1000_host_command_info {
 
 /* Host Interface "Rev 2" */
 struct e1000_host_mng_command_header {
-       u8  command_id;
-       u8  checksum;
+       u8 command_id;
+       u8 checksum;
        u16 reserved1;
        u16 reserved2;
        u16 command_length;
 };
 
-#define E1000_HI_MAX_MNG_DATA_LENGTH 0x6F8
+#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. */
+#include "mac.h"
+#include "phy.h"
+#include "nvm.h"
+#include "manage.h"
+
 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 *);
+       /* Function pointers for the MAC. */
+       s32(*init_params) (struct e1000_hw *);
+       s32(*id_led_init) (struct e1000_hw *);
+       s32(*blink_led) (struct e1000_hw *);
+       s32(*check_for_link) (struct e1000_hw *);
+       bool (*check_mng_mode) (struct e1000_hw *hw);
+        s32(*cleanup_led) (struct e1000_hw *);
+       void (*clear_hw_cntrs) (struct e1000_hw *);
+       void (*clear_vfta) (struct e1000_hw *);
+        s32(*get_bus_info) (struct e1000_hw *);
+       void (*set_lan_id) (struct e1000_hw *);
+        s32(*get_link_up_info) (struct e1000_hw *, u16 *, u16 *);
+        s32(*led_on) (struct e1000_hw *);
+        s32(*led_off) (struct e1000_hw *);
+       void (*update_mc_addr_list) (struct e1000_hw *, u8 *, u32);
+        s32(*reset_hw) (struct e1000_hw *);
+        s32(*init_hw) (struct e1000_hw *);
+        s32(*setup_link) (struct e1000_hw *);
+        s32(*setup_physical_interface) (struct e1000_hw *);
+        s32(*setup_led) (struct e1000_hw *);
+       void (*write_vfta) (struct e1000_hw *, u32, u32);
+       void (*config_collision_dist) (struct e1000_hw *);
+       void (*rar_set) (struct e1000_hw *, u8 *, u32);
+        s32(*read_mac_addr) (struct e1000_hw *);
+        s32(*validate_mdi_setting) (struct e1000_hw *);
+        s32(*mng_host_if_write) (struct e1000_hw *, u8 *, u16, u16, u8 *);
+        s32(*mng_write_cmd_header) (struct e1000_hw *hw,
+                                    struct e1000_host_mng_command_header *);
+        s32(*mng_enable_host_if) (struct e1000_hw *);
+        s32(*wait_autoneg) (struct e1000_hw *);
+        s32(*acquire_swfw_sync) (struct e1000_hw *, u16);
+       void (*release_swfw_sync) (struct e1000_hw *, u16);
 };
 
 /*
@@ -800,39 +531,41 @@ struct e1000_mac_operations {
  *
  */
 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. */
+       s32(*init_params) (struct e1000_hw *);
+       s32(*acquire) (struct e1000_hw *);
+       s32(*cfg_on_link_up) (struct e1000_hw *);
+       s32(*check_polarity) (struct e1000_hw *);
+       s32(*check_reset_block) (struct e1000_hw *);
+       s32(*commit) (struct e1000_hw *);
+       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 *);
+};
+
 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 *);
+       s32(*init_params) (struct e1000_hw *);
+       s32(*acquire) (struct e1000_hw *);
+       s32(*read) (struct e1000_hw *, u16, u16, u16 *);
+       void (*release) (struct e1000_hw *);
+       void (*reload) (struct e1000_hw *);
+        s32(*update) (struct e1000_hw *);
+        s32(*valid_led_default) (struct e1000_hw *, u16 *);
+        s32(*validate) (struct e1000_hw *);
+        s32(*write) (struct e1000_hw *, u16, u16, u16 *);
 };
 
 struct e1000_mac_info {
@@ -858,11 +591,11 @@ struct e1000_mac_info {
        u16 mta_reg_count;
 
        /* Maximum size of the MTA register table in all supported adapters */
-       #define MAX_MTA_REG 128
+#define MAX_MTA_REG 128
        u32 mta_shadow[MAX_MTA_REG];
        u16 rar_entry_count;
 
-       u8  forced_speed_duplex;
+       u8 forced_speed_duplex;
 
        bool adaptive_ifs;
        bool has_fwsm;
@@ -871,14 +604,13 @@ struct e1000_mac_info {
        bool autoneg_failed;
        bool get_link_status;
        bool in_ifs_mode;
+       enum e1000_serdes_link_state serdes_link_state;
        bool serdes_has_link;
        bool tx_pkt_filtering;
-       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;
@@ -890,7 +622,7 @@ struct e1000_phy_info {
 
        u32 addr;
        u32 id;
-       u32 reset_delay_us; /* in usec */
+       u32 reset_delay_us;     /* in usec */
        u32 revision;
 
        enum e1000_media_type media_type;
@@ -912,7 +644,6 @@ struct e1000_phy_info {
 
 struct e1000_nvm_info {
        struct e1000_nvm_operations ops;
-
        enum e1000_nvm_type type;
        enum e1000_nvm_override override;
 
@@ -927,20 +658,23 @@ struct e1000_nvm_info {
 };
 
 struct e1000_bus_info {
+       enum e1000_bus_type type;
+       enum e1000_bus_speed speed;
        enum e1000_bus_width width;
 
        u16 func;
+       u16 pci_cmd_word;
 };
 
 struct e1000_fc_info {
-       u32 high_water;          /* Flow control high-water mark */
-       u32 low_water;           /* Flow control low-water mark */
-       u16 pause_time;          /* Flow control pause timer */
-       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 */
+       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 {
@@ -949,21 +683,22 @@ struct e1000_dev_spec_82571 {
 };
 
 struct e1000_dev_spec_80003es2lan {
-       bool  mdic_wa_enable;
+       bool mdic_wa_enable;
 };
 
 struct e1000_shadow_ram {
-       u16  value;
+       u16 value;
        bool modified;
 };
 
-#define E1000_ICH8_SHADOW_RAM_WORDS            2048
+#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;
+       u16 eee_lp_ability;
 };
 
 struct e1000_hw {
@@ -972,18 +707,25 @@ struct e1000_hw {
        void __iomem *hw_addr;
        void __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_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_82571 e82571;
                struct e1000_dev_spec_80003es2lan e80003es2lan;
-               struct e1000_dev_spec_ich8lan   ich8lan;
+               struct e1000_dev_spec_ich8lan ich8lan;
        } dev_spec;
 };
 
+#include "82571.h"
+#include "80003es2lan.h"
+#include "ich8lan.h"
+
+/* These functions must be implemented by drivers */
+s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
+
 #endif
index 2401d9b65160ee929efd861485db0654c5570064..16d9fb3379aecea4b2f983558e4c1757b444fabe 100644 (file)
 
 #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
-#define I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT   0x80
-
-/* 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 */
-#define I82579_MSE_THRESHOLD    0x084F /* Mean Square Error Threshold */
-#define I82579_MSE_LINK_DOWN    0x2411 /* MSE count before dropping link */
-
-/* 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
-
-/* KMRN FIFO Control and Status */
-#define HV_KMRN_FIFO_CTRLSTA                  PHY_REG(770, 16)
-#define HV_KMRN_FIFO_CTRLSTA_PREAMBLE_MASK    0x7000
-#define HV_KMRN_FIFO_CTRLSTA_PREAMBLE_SHIFT   12
+static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw);
+static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw);
+static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw);
+static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw);
+static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw);
+static void e1000_release_swflag_ich8lan(struct e1000_hw *hw);
+static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw);
+static void e1000_release_nvm_ich8lan(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 void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
+static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw);
+static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw);
+static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
+static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active);
+static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active);
+static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset,
+                                 u16 words, u16 *data);
+static s32 e1000_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset,
+                                  u16 words, u16 *data);
+static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw);
+static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw);
+static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data);
+static s32 e1000_id_led_init_pchlan(struct e1000_hw *hw);
+static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw);
+static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw);
+static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw);
+static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw);
+static s32 e1000_get_link_up_info_ich8lan(struct e1000_hw *hw,
+                                         u16 *speed, u16 *duplex);
+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_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
+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 void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw);
+static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);
+static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout);
+static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw);
+static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw);
+static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);
+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw,
+                                        u32 offset, u8 *data);
+static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u8 size, u16 *data);
+static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw,
+                                        u32 offset, u16 *data);
+static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
+                                               u32 offset, u8 byte);
+static s32 e1000_write_flash_byte_ich8lan(struct e1000_hw *hw,
+                                         u32 offset, u8 data);
+static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
+                                         u8 size, u16 data);
+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);
+static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
+static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw);
+static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
+static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw);
+static s32 e1000_set_mdio_slow_mode_hv(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);
 
 /* 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 */
+               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;
 };
@@ -192,11 +146,11 @@ union ich8_hws_flash_status {
 /* 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 */
+               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;
 };
@@ -204,137 +158,85 @@ union ich8_hws_flash_ctrl {
 /* 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 */
+               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)
+/**
+ *  e1000_phy_is_accessible_pchlan - Check if able to access PHY registers
+ *  @hw: pointer to the HW structure
+ *
+ *  Test access to the PHY registers by reading the PHY ID registers.  If
+ *  the PHY ID is already known (e.g. resume path) compare it with known ID,
+ *  otherwise assume the read PHY ID is correct if it is valid.
+ *
+ *  Assumes the sw/fw/hw semaphore is already acquired.
+ **/
+static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
 {
-       return readw(hw->flash_address + reg);
-}
+       u16 phy_reg;
+       u32 phy_id;
 
-static inline u32 __er32flash(struct e1000_hw *hw, unsigned long reg)
-{
-       return readl(hw->flash_address + reg);
-}
+       hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_reg);
+       phy_id = (u32)(phy_reg << 16);
+       hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_reg);
+       phy_id |= (u32)(phy_reg & PHY_REVISION_MASK);
 
-static inline void __ew16flash(struct e1000_hw *hw, unsigned long reg, u16 val)
-{
-       writew(val, hw->flash_address + reg);
-}
+       if (hw->phy.id) {
+               if (hw->phy.id == phy_id)
+                       return true;
+       } else {
+               if ((phy_id != 0) && (phy_id != PHY_REVISION_MASK))
+                       hw->phy.id = phy_id;
+               return true;
+       }
 
-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);
+       return false;
 }
 
 /**
- *  e1000_init_phy_params_pchlan - Initialize PHY function pointers
+ *  e1000_init_phy_workarounds_pchlan - PHY initialization workarounds
  *  @hw: pointer to the HW structure
  *
- *  Initialize family-specific PHY parameters and function pointers.
+ *  Workarounds/flow necessary for PHY initialization during driver load
+ *  and resume paths.
  **/
-static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
+static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 {
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = 0;
+       u32 mac_reg, fwsm = er32(FWSM);
+       s32 ret_val;
+       u16 phy_reg;
 
-       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;
-
-       if (!e1000_check_reset_block(hw)) {
-               u32 fwsm = er32(FWSM);
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val) {
+               e_dbg("Failed to initialize PHY flow\n");
+               return ret_val;
+       }
+
+       /*
+        * The MAC-PHY interconnect may be in SMBus mode.  If the PHY is
+        * inaccessible and resetting the PHY is not blocked, toggle the
+        * LANPHYPC Value bit to force the interconnect to PCIe mode.
+        */
+       switch (hw->mac.type) {
+       case e1000_pch_lpt:
+               if (e1000_phy_is_accessible_pchlan(hw))
+                       break;
 
                /*
-                * The MAC-PHY interconnect may still be in SMBus mode after
-                * Sx->S0.  If resetting the PHY is not blocked, toggle the
-                * LANPHYPC Value bit to force the interconnect to PCIe mode.
+                * Before toggling LANPHYPC, see if PHY is accessible by
+                * forcing MAC to SMBus mode first.
                 */
-               e1000_toggle_lanphypc_value_ich8lan(hw);
-               msleep(50);
+               mac_reg = er32(CTRL_EXT);
+               mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;
+               ew32(CTRL_EXT, mac_reg);
 
+               /* fall-through */
+       case e1000_pch2lan:
                /*
                 * Gate automatic PHY configuration by hardware on
                 * non-managed 82579
@@ -343,51 +245,153 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
                        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)
-                       return ret_val;
+               if (e1000_phy_is_accessible_pchlan(hw)) {
+                       if (hw->mac.type == e1000_pch_lpt) {
+                               /* Unforce SMBus mode in PHY */
+                               hw->phy.ops.read_reg_locked(hw, CV_SMB_CTRL,
+                                                           &phy_reg);
+                               phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
+                               hw->phy.ops.write_reg_locked(hw, CV_SMB_CTRL,
+                                                            phy_reg);
+
+                               /* Unforce SMBus mode in MAC */
+                               mac_reg = er32(CTRL_EXT);
+                               mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
+                               ew32(CTRL_EXT, mac_reg);
+                       }
+                       break;
+               }
 
-               /* 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);
+               /* fall-through */
+       case e1000_pchlan:
+               if ((hw->mac.type == e1000_pchlan) &&
+                   (fwsm & E1000_ICH_FWSM_FW_VALID))
+                       break;
+
+               if (hw->phy.ops.check_reset_block(hw)) {
+                       e_dbg("Required LANPHYPC toggle blocked by ME\n");
+                       break;
                }
-       }
 
-       phy->id = e1000_phy_unknown;
-       switch (hw->mac.type) {
+               e_dbg("Toggling LANPHYPC\n");
+
+               /* Set Phy Config Counter to 50msec */
+               mac_reg = er32(FEXTNVM3);
+               mac_reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+               mac_reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+               ew32(FEXTNVM3, mac_reg);
+
+               /* Toggle LANPHYPC Value bit */
+               mac_reg = er32(CTRL);
+               mac_reg |= E1000_CTRL_LANPHYPC_OVERRIDE;
+               mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
+               ew32(CTRL, mac_reg);
+               e1e_flush();
+               udelay(10);
+               mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+               ew32(CTRL, mac_reg);
+               e1e_flush();
+               if (hw->mac.type < e1000_pch_lpt) {
+                       msleep(50);
+               } else {
+                       u16 count = 20;
+                       do {
+                               usleep_range(5000, 10000);
+                       } while (!(er32(CTRL_EXT) &
+                                  E1000_CTRL_EXT_LPCD) && count--);
+               }
+               break;
        default:
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       return ret_val;
-               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)
-                       return ret_val;
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       return ret_val;
                break;
        }
+
+       hw->phy.ops.release(hw);
+
+       /*
+        * 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);
+
+       /* 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);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  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;
+       s32 ret_val = 0;
+
+       phy->addr = 1;
+       phy->reset_delay_us = 100;
+
+       phy->ops.acquire = e1000_acquire_swflag_ich8lan;
+       phy->ops.check_reset_block = e1000_check_reset_block_ich8lan;
+       phy->ops.get_cfg_done = e1000_get_cfg_done_ich8lan;
+       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.release = e1000_release_swflag_ich8lan;
+       phy->ops.reset = e1000_phy_hw_reset_ich8lan;
+       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;
+
+       phy->id = e1000_phy_unknown;
+
+       ret_val = e1000_init_phy_workarounds_pchlan(hw);
+       if (ret_val)
+               return ret_val;
+
+       if (phy->id == e1000_phy_unknown)
+               switch (hw->mac.type) {
+               default:
+                       ret_val = e1000e_get_phy_id(hw);
+                       if (ret_val)
+                               return ret_val;
+                       if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+                               break;
+                       /* fall-through */
+               case e1000_pch2lan:
+               case e1000_pch_lpt:
+                       /*
+                        * 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)
+                               return ret_val;
+                       ret_val = e1000e_get_phy_id(hw);
+                       if (ret_val)
+                               return ret_val;
+                       break;
+               }
        phy->type = e1000e_get_phy_type_from_id(phy->id);
 
        switch (phy->type) {
        case e1000_phy_82577:
        case e1000_phy_82579:
+       case e1000_phy_i217:
                phy->ops.check_polarity = e1000_check_polarity_82577;
                phy->ops.force_speed_duplex =
                    e1000_phy_force_speed_duplex_82577;
@@ -421,11 +425,21 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
        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;
+       phy->addr = 1;
+       phy->reset_delay_us = 100;
+
+       phy->ops.acquire = e1000_acquire_swflag_ich8lan;
+       phy->ops.check_reset_block = e1000_check_reset_block_ich8lan;
+       phy->ops.get_cable_length = e1000e_get_cable_length_igp_2;
+       phy->ops.get_cfg_done = e1000_get_cfg_done_ich8lan;
+       phy->ops.read_reg = e1000e_read_phy_reg_igp;
+       phy->ops.release = e1000_release_swflag_ich8lan;
+       phy->ops.reset = e1000_phy_hw_reset_ich8lan;
+       phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_ich8lan;
+       phy->ops.set_d3_lplu_state = e1000_set_d3_lplu_state_ich8lan;
+       phy->ops.write_reg = e1000e_write_phy_reg_igp;
+       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,
@@ -434,7 +448,7 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
        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;
+               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");
@@ -529,7 +543,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
         * size represents two separate NVM banks.
         */
        nvm->flash_bank_size = (sector_end_addr - sector_base_addr)
-                               << FLASH_SECTOR_ADDR_SHIFT;
+           << FLASH_SECTOR_ADDR_SHIFT;
        nvm->flash_bank_size /= 2;
        /* Adjust to word count */
        nvm->flash_bank_size /= sizeof(u16);
@@ -539,9 +553,18 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
        /* 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;
+               dev_spec->shadow_ram[i].value = 0xFFFF;
        }
 
+       /* Function Pointers */
+       nvm->ops.acquire = e1000_acquire_nvm_ich8lan;
+       nvm->ops.release = e1000_release_nvm_ich8lan;
+       nvm->ops.read = e1000_read_nvm_ich8lan;
+       nvm->ops.update = e1000_update_nvm_checksum_ich8lan;
+       nvm->ops.valid_led_default = e1000_valid_led_default_ich8lan;
+       nvm->ops.validate = e1000_validate_nvm_checksum_ich8lan;
+       nvm->ops.write = e1000_write_nvm_ich8lan;
+
        return 0;
 }
 
@@ -572,7 +595,30 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
        /* Adaptive IFS supported */
        mac->adaptive_ifs = true;
 
-       /* LED operations */
+       /* Function pointers */
+
+       /* bus type/speed/width */
+       mac->ops.get_bus_info = e1000_get_bus_info_ich8lan;
+       /* function id */
+       mac->ops.set_lan_id = e1000_set_lan_id_single_port;
+       /* reset */
+       mac->ops.reset_hw = e1000_reset_hw_ich8lan;
+       /* hw initialization */
+       mac->ops.init_hw = e1000_init_hw_ich8lan;
+       /* link setup */
+       mac->ops.setup_link = e1000_setup_link_ich8lan;
+       /* physical interface setup */
+       mac->ops.setup_physical_interface = e1000_setup_copper_link_ich8lan;
+       /* check for link */
+       mac->ops.check_for_link = e1000_check_for_copper_link_ich8lan;
+       /* link info */
+       mac->ops.get_link_up_info = e1000_get_link_up_info_ich8lan;
+       /* multicast address update */
+       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
+       /* clear hardware counters */
+       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_ich8lan;
+
+       /* LED and other operations */
        switch (mac->type) {
        case e1000_ich8lan:
        case e1000_ich9lan:
@@ -580,7 +626,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                /* 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;
+               mac->ops.id_led_init = e1000e_id_led_init_generic;
                /* blink LED */
                mac->ops.blink_led = e1000e_blink_led_generic;
                /* setup LED */
@@ -591,8 +637,12 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                mac->ops.led_on = e1000_led_on_ich8lan;
                mac->ops.led_off = e1000_led_off_ich8lan;
                break;
-       case e1000_pchlan:
        case e1000_pch2lan:
+               mac->rar_entry_count = E1000_PCH2_RAR_ENTRIES;
+               mac->ops.rar_set = e1000_rar_set_pch2lan;
+               /* fall-through */
+       case e1000_pch_lpt:
+       case e1000_pchlan:
                /* check management mode */
                mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
                /* ID LED init */
@@ -609,12 +659,20 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                break;
        }
 
+       if (mac->type == e1000_pch_lpt) {
+               mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
+               mac->ops.rar_set = e1000_rar_set_pch_lpt;
+       }
+
        /* 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) &&
+       /*
+        * Gate automatic PHY configuration by hardware on managed
+        * 82579 and i217
+        */
+       if ((mac->type == e1000_pch2lan || mac->type == e1000_pch_lpt) &&
            (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
                e1000_gate_hw_phy_config_ich8lan(hw, true);
 
@@ -630,22 +688,51 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
  **/
 static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 {
+       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
        s32 ret_val = 0;
        u16 phy_reg;
 
-       if (hw->phy.type != e1000_phy_82579)
+       if ((hw->phy.type != e1000_phy_82579) &&
+           (hw->phy.type != e1000_phy_i217))
                return 0;
 
        ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
        if (ret_val)
                return ret_val;
 
-       if (hw->dev_spec.ich8lan.eee_disable)
+       if (dev_spec->eee_disable)
                phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
        else
                phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
 
-       return e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+       ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+       if (ret_val)
+               return ret_val;
+
+       if ((hw->phy.type == e1000_phy_i217) && !dev_spec->eee_disable) {
+               /* Save off link partner's EEE ability */
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       return ret_val;
+               ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                                                      I217_EEE_LP_ABILITY);
+               if (ret_val)
+                       goto release;
+               hw->phy.ops.read_reg_locked(hw, I82579_EMI_DATA,
+                                           &dev_spec->eee_lp_ability);
+
+               /*
+                * EEE is not supported in 100Half, so ignore partner's EEE
+                * in 100 ability if full-duplex is not advertised.
+                */
+               hw->phy.ops.read_reg_locked(hw, PHY_LP_ABILITY, &phy_reg);
+               if (!(phy_reg & NWAY_LPAR_100TX_FD_CAPS))
+                       dev_spec->eee_lp_ability &= ~I217_EEE_100_SUPPORTED;
+release:
+               hw->phy.ops.release(hw);
+       }
+
+       return 0;
 }
 
 /**
@@ -687,8 +774,11 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                        return ret_val;
        }
 
+       /* Clear link partner's EEE ability */
+       hw->dev_spec.ich8lan.eee_lp_ability = 0;
+
        if (!link)
-               return 0; /* No link detected */
+               return 0;       /* No link detected */
 
        mac->get_link_status = false;
 
@@ -746,7 +836,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
         * of MAC speed/duplex configuration.  So we only need to
         * configure Collision Distance in the MAC.
         */
-       e1000e_config_collision_dist(hw);
+       mac->ops.config_collision_dist(hw);
 
        /*
         * Configure Flow Control now that Auto-Neg has completed.
@@ -761,62 +851,32 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
        return ret_val;
 }
 
-static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
+/**
+ *  e1000_init_function_pointers_ich8lan - Initialize ICH8 function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize family-specific function pointers for PHY, MAC, and NVM.
+ **/
+void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw)
 {
-       struct e1000_hw *hw = &adapter->hw;
-       s32 rc;
-
-       rc = e1000_init_mac_params_ich8lan(hw);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_nvm_params_ich8lan(hw);
-       if (rc)
-               return rc;
-
+       e1000_init_mac_ops_generic(hw);
+       e1000_init_nvm_ops_generic(hw);
+       hw->mac.ops.init_params = e1000_init_mac_params_ich8lan;
+       hw->nvm.ops.init_params = e1000_init_nvm_params_ich8lan;
        switch (hw->mac.type) {
        case e1000_ich8lan:
        case e1000_ich9lan:
        case e1000_ich10lan:
-               rc = e1000_init_phy_params_ich8lan(hw);
+               hw->phy.ops.init_params = e1000_init_phy_params_ich8lan;
                break;
        case e1000_pchlan:
        case e1000_pch2lan:
-               rc = e1000_init_phy_params_pchlan(hw);
+       case e1000_pch_lpt:
+               hw->phy.ops.init_params = e1000_init_phy_params_pchlan;
                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_ife))
-               adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
-
-       /* Enable workaround for 82579 w/ ME enabled */
-       if ((adapter->hw.mac.type == e1000_pch2lan) &&
-           (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
-               adapter->flags2 |= FLAG2_PCIM2PCI_ARBITER_WA;
-
-       /* 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);
@@ -894,7 +954,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 
        if (!timeout) {
                e_dbg("Failed to acquire the semaphore, FW or HW has it: FWSM=0x%8.8x EXTCNF_CTRL=0x%8.8x)\n",
-                     er32(FWSM), extcnf_ctrl);
+                    er32(FWSM), extcnf_ctrl);
                extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
                ew32(EXTCNF_CTRL, extcnf_ctrl);
                ret_val = -E1000_ERR_CONFIG;
@@ -945,8 +1005,8 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
 
        fwsm = er32(FWSM);
        return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-              ((fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+           ((fwsm & E1000_FWSM_MODE_MASK) ==
+            (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
 }
 
 /**
@@ -963,7 +1023,146 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
 
        fwsm = er32(FWSM);
        return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-              (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+           (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+}
+
+/**
+ *  e1000_rar_set_pch2lan - 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.  For 82579, RAR[0] is the base address register that is to
+ *  contain the MAC address but RAR[1-6] are reserved for manageability (ME).
+ *  Use SHRA[0-3] in place of those reserved for ME.
+ **/
+static void e1000_rar_set_pch2lan(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;
+
+       if (index == 0) {
+               ew32(RAL(index), rar_low);
+               e1e_flush();
+               ew32(RAH(index), rar_high);
+               e1e_flush();
+               return;
+       }
+
+       if (index < hw->mac.rar_entry_count) {
+               s32 ret_val;
+
+               ret_val = e1000_acquire_swflag_ich8lan(hw);
+               if (ret_val)
+                       goto out;
+
+               ew32(SHRAL(index - 1), rar_low);
+               e1e_flush();
+               ew32(SHRAH(index - 1), rar_high);
+               e1e_flush();
+
+               e1000_release_swflag_ich8lan(hw);
+
+               /* verify the register updates */
+               if ((er32(SHRAL(index - 1)) == rar_low) &&
+                   (er32(SHRAH(index - 1)) == rar_high))
+                       return;
+
+               e_dbg("SHRA[%d] might be locked by ME - FWSM=0x%8.8x\n",
+                     (index - 1), er32(FWSM));
+       }
+
+out:
+       e_dbg("Failed to write receive address at index %d\n", index);
+}
+
+/**
+ *  e1000_rar_set_pch_lpt - Set receive address registers
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index: receive address array register
+ *
+ *  Sets the receive address register array at index to the address passed
+ *  in by addr. For LPT, RAR[0] is the base address register that is to
+ *  contain the MAC address. SHRA[0-10] are the shared receive address
+ *  registers that are shared between the Host and manageability engine (ME).
+ **/
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+{
+       u32 rar_low, rar_high;
+       u32 wlock_mac;
+
+       /*
+        * 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;
+
+       if (index == 0) {
+               ew32(RAL(index), rar_low);
+               e1e_flush();
+               ew32(RAH(index), rar_high);
+               e1e_flush();
+               return;
+       }
+
+       /*
+        * The manageability engine (ME) can lock certain SHRAR registers that
+        * it is using - those registers are unavailable for use.
+        */
+       if (index < hw->mac.rar_entry_count) {
+               wlock_mac = er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK;
+               wlock_mac >>= E1000_FWSM_WLOCK_MAC_SHIFT;
+
+               /* Check if all SHRAR registers are locked */
+               if (wlock_mac == 1)
+                       goto out;
+
+               if ((wlock_mac == 0) || (index <= wlock_mac)) {
+                       s32 ret_val;
+
+                       ret_val = e1000_acquire_swflag_ich8lan(hw);
+
+                       if (ret_val)
+                               goto out;
+
+                       ew32(SHRAL_PCH_LPT(index - 1), rar_low);
+                       e1e_flush();
+                       ew32(SHRAH_PCH_LPT(index - 1), rar_high);
+                       e1e_flush();
+
+                       e1000_release_swflag_ich8lan(hw);
+
+                       /* verify the register updates */
+                       if ((er32(SHRAL_PCH_LPT(index - 1)) == rar_low) &&
+                           (er32(SHRAH_PCH_LPT(index - 1)) == rar_high))
+                               return;
+               }
+       }
+
+out:
+       e_dbg("Failed to write receive address at index %d\n", index);
 }
 
 /**
@@ -979,7 +1178,6 @@ 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;
 }
 
@@ -994,6 +1192,8 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
 {
        u16 phy_data;
        u32 strap = er32(STRAP);
+       u32 freq = (strap & E1000_STRAP_SMT_FREQ_MASK) >>
+           E1000_STRAP_SMT_FREQ_SHIFT;
        s32 ret_val = 0;
 
        strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
@@ -1006,6 +1206,19 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
        phy_data |= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
        phy_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
 
+       if (hw->phy.type == e1000_phy_i217) {
+               /* Restore SMBus frequency */
+               if (freq--) {
+                       phy_data &= ~HV_SMB_ADDR_FREQ_MASK;
+                       phy_data |= (freq & (1 << 0)) <<
+                           HV_SMB_ADDR_FREQ_LOW_SHIFT;
+                       phy_data |= (freq & (1 << 1)) <<
+                           HV_SMB_ADDR_FREQ_HIGH_SHIFT;
+               } else {
+                       e_dbg("Unsupported SMB frequency in PHY\n");
+               }
+       }
+
        return e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
 }
 
@@ -1043,6 +1256,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                /* Fall-thru */
        case e1000_pchlan:
        case e1000_pch2lan:
+       case e1000_pch_lpt:
                sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
                break;
        default:
@@ -1062,10 +1276,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         * extended configuration before SW configuration
         */
        data = er32(EXTCNF_CTRL);
-       if (!(hw->mac.type == e1000_pch2lan)) {
-               if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
-                       goto release;
-       }
+       if ((hw->mac.type < e1000_pch2lan) &&
+           (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE))
+               goto release;
 
        cnf_size = er32(EXTCNF_SIZE);
        cnf_size &= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK;
@@ -1076,9 +1289,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
        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)) {
+       if (((hw->mac.type == e1000_pchlan) &&
+            !(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)) ||
+           (hw->mac.type > e1000_pchlan)) {
                /*
                 * HW configures the SMBus address and LEDs when the
                 * OEM and LCD Write Enable bits are set in the NVM.
@@ -1102,8 +1315,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
        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);
+               ret_val = e1000_read_nvm(hw, (word_addr + i * 2), 1, &reg_data);
                if (ret_val)
                        goto release;
 
@@ -1160,46 +1372,45 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
        if (link) {
                if (hw->phy.type == e1000_phy_82578) {
                        ret_val = hw->phy.ops.read_reg_locked(hw, BM_CS_STATUS,
-                                                                 &status_reg);
+                                                             &status_reg);
                        if (ret_val)
                                goto release;
 
                        status_reg &= BM_CS_STATUS_LINK_UP |
-                                     BM_CS_STATUS_RESOLVED |
-                                     BM_CS_STATUS_SPEED_MASK;
+                           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))
+                                          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);
+                                                             &status_reg);
                        if (ret_val)
                                goto release;
 
                        status_reg &= HV_M_STATUS_LINK_UP |
-                                     HV_M_STATUS_AUTONEG_COMPLETE |
-                                     HV_M_STATUS_SPEED_MASK;
+                           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))
+                                          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);
+                                                      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);
+                                                      0x4100);
                if (ret_val)
                        goto release;
        }
@@ -1230,9 +1441,8 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
        u32 reg = 0;
        u16 kmrn_reg = 0;
 
-       ret_val = e1000e_read_kmrn_reg_locked(hw,
-                                            E1000_KMRNCTRLSTA_K1_CONFIG,
-                                            &kmrn_reg);
+       ret_val = e1000e_read_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
+                                             &kmrn_reg);
        if (ret_val)
                return ret_val;
 
@@ -1241,9 +1451,8 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
        else
                kmrn_reg &= ~E1000_KMRNCTRLSTA_K1_ENABLE;
 
-       ret_val = e1000e_write_kmrn_reg_locked(hw,
-                                             E1000_KMRNCTRLSTA_K1_CONFIG,
-                                             kmrn_reg);
+       ret_val = e1000e_write_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
+                                              kmrn_reg);
        if (ret_val)
                return ret_val;
 
@@ -1281,14 +1490,14 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
        u32 mac_reg;
        u16 oem_reg;
 
-       if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pchlan))
+       if (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)) {
+       if (hw->mac.type == e1000_pchlan) {
                mac_reg = er32(EXTCNF_CTRL);
                if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
                        goto release;
@@ -1335,7 +1544,6 @@ release:
        return ret_val;
 }
 
-
 /**
  *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
  *  @hw:   pointer to the HW structure
@@ -1486,7 +1694,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
        u32 mac_reg;
        u16 i;
 
-       if (hw->mac.type != e1000_pch2lan)
+       if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pch_lpt))
                return 0;
 
        /* disable Rx path while enabling/disabling workaround */
@@ -1501,7 +1709,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                 * 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};
+                       u8 mac_addr[ETH_ALEN] = { 0 };
                        u32 addr_high, addr_low;
 
                        addr_high = er32(RAH(i));
@@ -1532,8 +1740,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                ew32(RCTL, mac_reg);
 
                ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               &data);
+                                              E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                              &data);
                if (ret_val)
                        return ret_val;
                ret_val = e1000e_write_kmrn_reg(hw,
@@ -1542,8 +1750,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                if (ret_val)
                        return ret_val;
                ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               &data);
+                                              E1000_KMRNCTRLSTA_HD_CTRL,
+                                              &data);
                if (ret_val)
                        return ret_val;
                data &= ~(0xF << 8);
@@ -1590,8 +1798,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                ew32(RCTL, mac_reg);
 
                ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               &data);
+                                              E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                              &data);
                if (ret_val)
                        return ret_val;
                ret_val = e1000e_write_kmrn_reg(hw,
@@ -1600,8 +1808,8 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
                if (ret_val)
                        return ret_val;
                ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               &data);
+                                              E1000_KMRNCTRLSTA_HD_CTRL,
+                                              &data);
                if (ret_val)
                        return ret_val;
                data &= ~(0xF << 8);
@@ -1710,8 +1918,18 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
                        return ret_val;
 
                if (status_reg & HV_M_STATUS_SPEED_1000) {
+                       u16 pm_phy_reg;
+
                        mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
                        phy_reg &= ~I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
+                       /* LV 1G Packet drop issue wa  */
+                       ret_val = e1e_rphy(hw, HV_PM_CTRL, &pm_phy_reg);
+                       if (ret_val)
+                               return ret_val;
+                       pm_phy_reg &= ~HV_PM_CTRL_PLL_STOP_IN_K1_GIGA;
+                       ret_val = e1e_wphy(hw, HV_PM_CTRL, pm_phy_reg);
+                       if (ret_val)
+                               return ret_val;
                } else {
                        mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
                        phy_reg |= I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
@@ -1735,7 +1953,7 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
 {
        u32 extcnf_ctrl;
 
-       if (hw->mac.type != e1000_pch2lan)
+       if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pch_lpt))
                return;
 
        extcnf_ctrl = er32(EXTCNF_CTRL);
@@ -1789,7 +2007,7 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
        s32 ret_val = 0;
        u16 reg;
 
-       if (e1000_check_reset_block(hw))
+       if (hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /* Allow time for h/w to get to quiescent state after reset */
@@ -1898,7 +2116,7 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
        else
                oem_reg &= ~HV_OEM_BITS_LPLU;
 
-       if (!e1000_check_reset_block(hw))
+       if (!hw->phy.ops.check_reset_block(hw))
                oem_reg |= HV_OEM_BITS_RESTART_AN;
 
        return e1e_wphy(hw, HV_OEM_BITS, oem_reg);
@@ -1963,25 +2181,25 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
                 * SmartSpeed, so performance is maintained.
                 */
                if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
+                       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);
+                       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);
+                       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);
+                       ret_val = e1e_wphy(hw,
+                                          IGP01E1000_PHY_PORT_CONFIG, data);
                        if (ret_val)
                                return ret_val;
                }
@@ -2026,25 +2244,25 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
                 * SmartSpeed, so performance is maintained.
                 */
                if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
+                       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);
+                       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);
+                       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);
+                       ret_val = e1e_wphy(hw,
+                                          IGP01E1000_PHY_PORT_CONFIG, data);
                        if (ret_val)
                                return ret_val;
                }
@@ -2114,7 +2332,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                /* Check bank 0 */
                ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset,
-                                                       &sig_byte);
+                                                       &sig_byte);
                if (ret_val)
                        return ret_val;
                if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
@@ -2125,8 +2343,8 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                /* Check bank 1 */
                ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset +
-                                                       bank1_offset,
-                                                       &sig_byte);
+                                                       bank1_offset,
+                                                       &sig_byte);
                if (ret_val)
                        return ret_val;
                if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
@@ -2179,8 +2397,8 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
        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;
+               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,
@@ -2215,7 +2433,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
 
        /* Check if the flash descriptor is valid */
-       if (hsfsts.hsf_status.fldesvalid == 0) {
+       if (!hsfsts.hsf_status.fldesvalid) {
                e_dbg("Flash descriptor invalid.  SW Sequencing must be used.\n");
                return -E1000_ERR_NVM;
        }
@@ -2235,7 +2453,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
         * completed.
         */
 
-       if (hsfsts.hsf_status.flcinprog == 0) {
+       if (!hsfsts.hsf_status.flcinprog) {
                /*
                 * There is no cycle running at present,
                 * so we can start a cycle.
@@ -2253,7 +2471,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                 */
                for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
                        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcinprog == 0) {
+                       if (!hsfsts.hsf_status.flcinprog) {
                                ret_val = 0;
                                break;
                        }
@@ -2295,12 +2513,12 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
        /* wait till FDONE bit is set to 1 */
        do {
                hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-               if (hsfsts.hsf_status.flcdone == 1)
+               if (hsfsts.hsf_status.flcdone)
                        break;
                udelay(1);
        } while (i++ < timeout);
 
-       if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0)
+       if (hsfsts.hsf_status.flcdone && !hsfsts.hsf_status.flcerr)
                return 0;
 
        return -E1000_ERR_NVM;
@@ -2320,7 +2538,6 @@ static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
 {
        /* Must convert offset into bytes. */
        offset <<= 1;
-
        return e1000_read_flash_data_ich8lan(hw, offset, 2, data);
 }
 
@@ -2366,11 +2583,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
        s32 ret_val = -E1000_ERR_NVM;
        u8 count = 0;
 
-       if (size < 1  || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
+       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;
+           hw->nvm.flash_base_addr;
 
        do {
                udelay(1);
@@ -2388,7 +2604,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
 
                ret_val = e1000_flash_cycle_ich8lan(hw,
-                                               ICH_FLASH_READ_COMMAND_TIMEOUT);
+                                                   ICH_FLASH_READ_COMMAND_TIMEOUT);
 
                /*
                 * Check if FCERR is set to 1, if set to 1, clear it
@@ -2411,10 +2627,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                         * ICH_FLASH_CYCLE_REPEAT_COUNT times.
                         */
                        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcerr == 1) {
+                       if (hsfsts.hsf_status.flcerr) {
                                /* Repeat for some time before giving up. */
                                continue;
-                       } else if (hsfsts.hsf_status.flcdone == 0) {
+                       } else if (!hsfsts.hsf_status.flcdone) {
                                e_dbg("Timeout error - flash cycle did not complete.\n");
                                break;
                        }
@@ -2449,8 +2665,8 @@ static s32 e1000_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
        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];
+               dev_spec->shadow_ram[offset + i].modified = true;
+               dev_spec->shadow_ram[offset + i].value = data[i];
        }
 
        nvm->ops.release(hw);
@@ -2491,7 +2707,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
         * 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);
+       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;
@@ -2521,8 +2737,8 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
                        data = dev_spec->shadow_ram[i].value;
                } else {
                        ret_val = e1000_read_flash_word_ich8lan(hw, i +
-                                                               old_bank_offset,
-                                                               &data);
+                                                               old_bank_offset,
+                                                               &data);
                        if (ret_val)
                                break;
                }
@@ -2551,8 +2767,8 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 
                udelay(100);
                ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
-                                                         act_offset + 1,
-                                                         (u8)(data >> 8));
+                                                              act_offset + 1,
+                                                              (u8)(data >> 8));
                if (ret_val)
                        break;
        }
@@ -2562,7 +2778,6 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
         * programming failed.
         */
        if (ret_val) {
-               /* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */
                e_dbg("Flash commit failed.\n");
                goto release;
        }
@@ -2610,7 +2825,7 @@ release:
         * until after the next adapter reset.
         */
        if (!ret_val) {
-               e1000e_reload_nvm(hw);
+               nvm->ops.reload(hw);
                usleep_range(10000, 20000);
        }
 
@@ -2644,7 +2859,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       if ((data & 0x40) == 0) {
+       if (!(data & 0x40)) {
                data |= 0x40;
                ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
                if (ret_val)
@@ -2657,47 +2872,6 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
        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
@@ -2722,7 +2896,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                return -E1000_ERR_NVM;
 
        flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                           hw->nvm.flash_base_addr;
+           hw->nvm.flash_base_addr;
 
        do {
                udelay(1);
@@ -2733,7 +2907,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
                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.fldbcount = size - 1;
                hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_WRITE;
                ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
 
@@ -2751,7 +2925,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                 * and try the whole sequence a few more times else done
                 */
                ret_val = e1000_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_WRITE_COMMAND_TIMEOUT);
+                                                   ICH_FLASH_WRITE_COMMAND_TIMEOUT);
                if (!ret_val)
                        break;
 
@@ -2762,10 +2936,10 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                 * try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
                 */
                hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-               if (hsfsts.hsf_status.flcerr == 1)
+               if (hsfsts.hsf_status.flcerr)
                        /* Repeat for some time before giving up. */
                        continue;
-               if (hsfsts.hsf_status.flcdone == 0) {
+               if (!hsfsts.hsf_status.flcdone) {
                        e_dbg("Timeout error - flash cycle did not complete.\n");
                        break;
                }
@@ -2883,7 +3057,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
        flash_linear_addr = hw->nvm.flash_base_addr;
        flash_linear_addr += (bank) ? flash_bank_size : 0;
 
-       for (j = 0; j < iteration ; j++) {
+       for (j = 0; j < iteration; j++) {
                do {
                        /* Steps */
                        ret_val = e1000_flash_cycle_init_ich8lan(hw);
@@ -2907,7 +3081,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                        ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
 
                        ret_val = e1000_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_ERASE_COMMAND_TIMEOUT);
+                                                           ICH_FLASH_ERASE_COMMAND_TIMEOUT);
                        if (!ret_val)
                                break;
 
@@ -2917,10 +3091,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
                         * a few more times else Done
                         */
                        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcerr == 1)
+                       if (hsfsts.hsf_status.flcerr)
                                /* repeat for some time before giving up */
                                continue;
-                       else if (hsfsts.hsf_status.flcdone == 0)
+                       else if (!hsfsts.hsf_status.flcdone)
                                return ret_val;
                } while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
        }
@@ -2947,8 +3121,7 @@ static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
                return ret_val;
        }
 
-       if (*data == ID_LED_RESERVED_0000 ||
-           *data == ID_LED_RESERVED_FFFF)
+       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
                *data = ID_LED_DEFAULT_ICH8LAN;
 
        return 0;
@@ -2963,7 +3136,7 @@ static s32 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
  *
  *  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()),
+ *  in ledctl_mode2 the LEDs to use for ID (see e1000e_id_led_init_generic()),
  *  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().
  **/
@@ -3062,8 +3235,8 @@ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
 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;
+       u16 kum_cfg;
+       u32 ctrl, reg;
        s32 ret_val;
 
        /*
@@ -3097,12 +3270,12 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        }
 
        if (hw->mac.type == e1000_pchlan) {
-               /* Save the NVM K1 bit setting*/
-               ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &reg);
+               /* Save the NVM K1 bit setting */
+               ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &kum_cfg);
                if (ret_val)
                        return ret_val;
 
-               if (reg & E1000_NVM_K1_ENABLE)
+               if (kum_cfg & E1000_NVM_K1_ENABLE)
                        dev_spec->nvm_k1_enabled = true;
                else
                        dev_spec->nvm_k1_enabled = false;
@@ -3110,7 +3283,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
 
        ctrl = er32(CTRL);
 
-       if (!e1000_check_reset_block(hw)) {
+       if (!hw->phy.ops.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
@@ -3132,6 +3305,14 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        /* cannot issue a flush here because it hangs the hardware */
        msleep(20);
 
+       /* Set Phy Config Counter to 50msec */
+       if (hw->mac.type == e1000_pch2lan) {
+               reg = er32(FEXTNVM3);
+               reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+               reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+               ew32(FEXTNVM3, reg);
+       }
+
        if (!ret_val)
                clear_bit(__E1000_ACCESS_SHARED_RESOURCE, &hw->adapter->state);
 
@@ -3156,9 +3337,9 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        ew32(IMC, 0xffffffff);
        er32(ICR);
 
-       kab = er32(KABGTXD);
-       kab |= E1000_KABGTXD_BGSQLBIAS;
-       ew32(KABGTXD, kab);
+       reg = er32(KABGTXD);
+       reg |= E1000_KABGTXD_BGSQLBIAS;
+       ew32(KABGTXD, reg);
 
        return 0;
 }
@@ -3188,7 +3369,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
        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 */
+       /* 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);
@@ -3213,20 +3394,20 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
        }
 
        /* Setup link and flow control */
-       ret_val = e1000_setup_link_ich8lan(hw);
+       ret_val = mac->ops.setup_link(hw);
 
        /* Set the transmit descriptor write-back policy for both queues */
        txdctl = er32(TXDCTL(0));
        txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                E1000_TXDCTL_FULL_TX_DESC_WB;
+           E1000_TXDCTL_FULL_TX_DESC_WB;
        txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+           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;
+           E1000_TXDCTL_FULL_TX_DESC_WB;
        txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+           E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
        ew32(TXDCTL(1), txdctl);
 
        /*
@@ -3236,7 +3417,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
        if (mac->type == e1000_ich8lan)
                snoop = PCIE_ICH8_SNOOP_ALL;
        else
-               snoop = (u32) ~(PCIE_NO_SNOOP_ALL);
+               snoop = (u32)~(PCIE_NO_SNOOP_ALL);
        e1000e_set_pcie_no_snoop(hw, snoop);
 
        ctrl_ext = er32(CTRL_EXT);
@@ -3253,6 +3434,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
 
        return ret_val;
 }
+
 /**
  *  e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits
  *  @hw: pointer to the HW structure
@@ -3311,6 +3493,12 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
         */
        reg = er32(RFCTL);
        reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
+       /*
+        * Disable IPv6 extension header parsing because some malformed
+        * IPv6 headers can hang the Rx.
+        */
+       if (hw->mac.type == e1000_ich8lan)
+               reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
        ew32(RFCTL, reg);
 }
 
@@ -3328,7 +3516,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 {
        s32 ret_val;
 
-       if (e1000_check_reset_block(hw))
+       if (hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /*
@@ -3350,21 +3538,22 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
         */
        hw->fc.current_mode = hw->fc.requested_mode;
 
-       e_dbg("After fix-ups FlowControl is now = %x\n",
-               hw->fc.current_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);
+       ret_val = hw->mac.ops.setup_physical_interface(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_i217) ||
            (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),
+               ret_val = e1e_wphy(hw,
+                                  PHY_REG(BM_PORT_CTRL_PAGE, 27),
                                   hw->fc.pause_time);
                if (ret_val)
                        return ret_val;
@@ -3400,13 +3589,15 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
        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);
+       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);
+       ret_val = e1000e_write_kmrn_reg(hw,
+                                       E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                       reg_data);
        if (ret_val)
                return ret_val;
 
@@ -3424,6 +3615,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
                break;
        case e1000_phy_82577:
        case e1000_phy_82579:
+       case e1000_phy_i217:
                ret_val = e1000_copper_link_setup_82577(hw);
                if (ret_val)
                        return ret_val;
@@ -3478,8 +3670,7 @@ static s32 e1000_get_link_up_info_ich8lan(struct e1000_hw *hw, u16 *speed,
                return ret_val;
 
        if ((hw->mac.type == e1000_ich8lan) &&
-           (hw->phy.type == e1000_phy_igp_3) &&
-           (*speed == SPEED_1000)) {
+           (hw->phy.type == e1000_phy_igp_3) && (*speed == SPEED_1000)) {
                ret_val = e1000_kmrn_lock_loss_workaround_ich8lan(hw);
        }
 
@@ -3556,7 +3747,7 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
 }
 
 /**
- *  e1000_set_kmrn_lock_loss_workaround_ich8lan - Set Kumeran workaround state
+ *  e1000e_set_kmrn_lock_loss_workaround_ich8lan - Set Kumeran workaround state
  *  @hw: pointer to the HW structure
  *  @state: boolean value used to set the current Kumeran workaround state
  *
@@ -3564,7 +3755,7 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
  *  /disabled - false).
  **/
 void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                bool state)
+                                                 bool state)
 {
        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 
@@ -3590,7 +3781,7 @@ void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw)
 {
        u32 reg;
        u16 data;
-       u8  retry = 0;
+       u8 retry = 0;
 
        if (hw->phy.type != e1000_phy_igp_3)
                return;
@@ -3647,17 +3838,19 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
                return;
 
        ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                     &reg_data);
+                                      &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);
+       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);
+       ret_val = e1000e_write_kmrn_reg(hw,
+                                       E1000_KMRNCTRLSTA_DIAG_OFFSET,
+                                       reg_data);
 }
 
 /**
@@ -3670,14 +3863,92 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
  *  the LPLU setting in the NVM or custom setting.  For PCH and newer parts,
  *  the OEM bits PHY register (LED, GbE disable and LPLU configurations) also
  *  needs to be written.
+ *  Parts that support (and are linked to a partner which support) EEE in
+ *  100Mbps should disable LPLU since 100Mbps w/ EEE requires less power
+ *  than 10Mbps w/o EEE.
  **/
 void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 {
+       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
        u32 phy_ctrl;
        s32 ret_val;
 
        phy_ctrl = er32(PHY_CTRL);
        phy_ctrl |= E1000_PHY_CTRL_GBE_DISABLE;
+       if (hw->phy.type == e1000_phy_i217) {
+               u16 phy_reg;
+
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       goto out;
+
+               if (!dev_spec->eee_disable) {
+                       u16 eee_advert;
+
+                       ret_val = hw->phy.ops.write_reg_locked(hw,
+                                                              I82579_EMI_ADDR,
+                                                              I217_EEE_ADVERTISEMENT);
+                       if (ret_val)
+                               goto release;
+                       hw->phy.ops.read_reg_locked(hw, I82579_EMI_DATA,
+                                                   &eee_advert);
+
+                       /*
+                        * Disable LPLU if both link partners support 100BaseT
+                        * EEE and 100Full is advertised on both ends of the
+                        * link.
+                        */
+                       if ((eee_advert & I217_EEE_100_SUPPORTED) &&
+                           (dev_spec->eee_lp_ability &
+                            I217_EEE_100_SUPPORTED) &&
+                           (hw->phy.autoneg_advertised & ADVERTISE_100_FULL))
+                               phy_ctrl &= ~(E1000_PHY_CTRL_D0A_LPLU |
+                                             E1000_PHY_CTRL_NOND0A_LPLU);
+               }
+
+               /*
+                * For i217 Intel Rapid Start Technology support,
+                * when the system is going into Sx and no manageability engine
+                * is present, the driver must configure proxy to reset only on
+                * power good.  LPI (Low Power Idle) state must also reset only
+                * on power good, as well as the MTA (Multicast table array).
+                * The SMBus release must also be disabled on LCD reset.
+                */
+               if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+
+                       /* Enable proxy to reset only on power good. */
+                       hw->phy.ops.read_reg_locked(hw, I217_PROXY_CTRL,
+                                                   &phy_reg);
+                       phy_reg |= I217_PROXY_CTRL_AUTO_DISABLE;
+                       hw->phy.ops.write_reg_locked(hw, I217_PROXY_CTRL,
+                                                    phy_reg);
+
+                       /*
+                        * Set bit enable LPI (EEE) to reset only on
+                        * power good.
+                        */
+                       hw->phy.ops.read_reg_locked(hw, I217_SxCTRL, &phy_reg);
+                       phy_reg |= I217_SxCTRL_MASK;
+                       hw->phy.ops.write_reg_locked(hw, I217_SxCTRL, phy_reg);
+
+                       /* Disable the SMB release on LCD reset. */
+                       hw->phy.ops.read_reg_locked(hw, I217_MEMPWR, &phy_reg);
+                       phy_reg &= ~I217_MEMPWR;
+                       hw->phy.ops.write_reg_locked(hw, I217_MEMPWR, phy_reg);
+               }
+
+               /*
+                * Enable MTA to reset for Intel Rapid Start Technology
+                * Support
+                */
+               hw->phy.ops.read_reg_locked(hw, I217_CGFREG, &phy_reg);
+               phy_reg |= I217_CGFREG_MASK;
+               hw->phy.ops.write_reg_locked(hw, I217_CGFREG, phy_reg);
+
+release:
+               hw->phy.ops.release(hw);
+       }
+out:
        ew32(PHY_CTRL, phy_ctrl);
 
        if (hw->mac.type == e1000_ich8lan)
@@ -3706,43 +3977,63 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
  *  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.
+ *  On i217, setup Intel Rapid Start Technology.
  **/
 void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 {
-       u16 phy_id1, phy_id2;
        s32 ret_val;
 
-       if ((hw->mac.type != e1000_pch2lan) || e1000_check_reset_block(hw))
+       if (hw->mac.type < e1000_pch2lan)
                return;
 
-       ret_val = hw->phy.ops.acquire(hw);
+       ret_val = e1000_init_phy_workarounds_pchlan(hw);
        if (ret_val) {
-               e_dbg("Failed to acquire PHY semaphore in resume\n");
+               e_dbg("Failed to init PHY flow ret_val=%d\n", ret_val);
                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;
+       /*
+        * For i217 Intel Rapid Start Technology support when the system
+        * is transitioning from Sx and no manageability engine is present
+        * configure SMBus to restore on reset, disable proxy, and enable
+        * the reset on MTA (Multicast table array).
+        */
+       if (hw->phy.type == e1000_phy_i217) {
+               u16 phy_reg;
 
-       e1000_toggle_lanphypc_value_ich8lan(hw);
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val) {
+                       e_dbg("Failed to setup iRST\n");
+                       return;
+               }
 
-       hw->phy.ops.release(hw);
-       msleep(50);
-       e1000_phy_hw_reset(hw);
-       msleep(50);
-       return;
+               if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+                       /*
+                        * Restore clear on SMB if no manageability engine
+                        * is present
+                        */
+                       ret_val = hw->phy.ops.read_reg_locked(hw, I217_MEMPWR,
+                                                             &phy_reg);
+                       if (ret_val)
+                               goto release;
+                       phy_reg |= I217_MEMPWR_MASK;
+                       hw->phy.ops.write_reg_locked(hw, I217_MEMPWR, phy_reg);
 
+                       /* Disable Proxy */
+                       hw->phy.ops.write_reg_locked(hw, I217_PROXY_CTRL, 0);
+               }
+               /* Enable reset on MTA */
+               ret_val = hw->phy.ops.read_reg_locked(hw, I217_CGFREG,
+                                                     &phy_reg);
+               if (ret_val)
+                       goto release;
+               phy_reg &= ~I217_CGFREG_MASK;
+               hw->phy.ops.write_reg_locked(hw, I217_CGFREG, phy_reg);
 release:
-       hw->phy.ops.release(hw);
+               if (ret_val)
+                       e_dbg("Error %d in resume workarounds\n", ret_val);
+               hw->phy.ops.release(hw);
+       }
 }
 
 /**
@@ -3922,7 +4213,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
 
        /* 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) &&
+               if (!(er32(EECD) & E1000_EECD_PRES) &&
                    (hw->phy.type == e1000_phy_igp_3)) {
                        e1000e_phy_init_script_igp3(hw);
                }
@@ -3983,6 +4274,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
        /* Clear PHY statistics registers */
        if ((hw->phy.type == e1000_phy_82578) ||
            (hw->phy.type == e1000_phy_82579) ||
+           (hw->phy.type == e1000_phy_i217) ||
            (hw->phy.type == e1000_phy_82577)) {
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
@@ -4009,134 +4301,3 @@ 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_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_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 18,
-       .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_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 18,
-       .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_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_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/ich8lan.h b/drivers/net/e1000e/ich8lan.h
new file mode 100644 (file)
index 0000000..37f88fa
--- /dev/null
@@ -0,0 +1,306 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_ICH8LAN_H_
+#define _E1000_ICH8LAN_H_
+
+#define ICH_FLASH_GFPREG               0x0000
+#define ICH_FLASH_HSFSTS               0x0004
+#define ICH_FLASH_HSFCTL               0x0006
+#define ICH_FLASH_FADDR                        0x0008
+#define ICH_FLASH_FDATA0               0x0010
+
+/* Requires up to 10 seconds when MNG might be accessing part. */
+#define ICH_FLASH_READ_COMMAND_TIMEOUT 10000000
+#define ICH_FLASH_WRITE_COMMAND_TIMEOUT        10000000
+#define ICH_FLASH_ERASE_COMMAND_TIMEOUT        10000000
+#define ICH_FLASH_LINEAR_ADDR_MASK     0x00FFFFFF
+#define ICH_FLASH_CYCLE_REPEAT_COUNT   10
+
+#define ICH_CYCLE_READ                 0
+#define ICH_CYCLE_WRITE                        2
+#define ICH_CYCLE_ERASE                        3
+
+#define FLASH_GFPREG_BASE_MASK         0x1FFF
+#define FLASH_SECTOR_ADDR_SHIFT                12
+
+#define ICH_FLASH_SEG_SIZE_256         256
+#define ICH_FLASH_SEG_SIZE_4K          4096
+#define ICH_FLASH_SEG_SIZE_8K          8192
+#define ICH_FLASH_SEG_SIZE_64K         65536
+#define ICH_FLASH_SECTOR_SIZE          4096
+
+#define ICH_FLASH_REG_MAPSIZE          0x00A0
+
+#define E1000_ICH_FWSM_RSPCIPHY                0x00000040      /* Reset PHY on PCI Reset */
+#define E1000_ICH_FWSM_DISSW           0x10000000      /* FW Disables SW Writes */
+/* FW established a valid mode */
+#define E1000_ICH_FWSM_FW_VALID                0x00008000
+#define E1000_ICH_FWSM_PCIM2PCI                0x01000000      /* ME PCIm-to-PCI active */
+#define E1000_ICH_FWSM_PCIM2PCI_COUNT  2000
+
+#define E1000_ICH_MNG_IAMT_MODE                0x2
+
+#define E1000_FWSM_PROXY_MODE          0x00000008      /* FW is in proxy mode */
+#define E1000_FWSM_MEMC                        0x00000010      /* ME Messaging capable */
+#define E1000_FWSM_WLOCK_MAC_MASK      0x0380
+#define E1000_FWSM_WLOCK_MAC_SHIFT     7
+
+/* Shared Receive Address Registers */
+#define E1000_SHRAL(_i)                (0x05438 + ((_i) * 8))
+#define E1000_SHRAH(_i)                (0x0543C + ((_i) * 8))
+#define E1000_SHRAH_AV         0x80000000      /* Addr Valid bit */
+#define E1000_SHRAH_MAV                0x40000000      /* Multicast Addr Valid bit */
+
+#define E1000_SHRAL_PCH_LPT(_i)                (0x05408 + ((_i) * 8))
+#define E1000_SHRAH_PCH_LPT(_i)                (0x0540C + ((_i) * 8))
+
+#define E1000_H2ME             0x05B50 /* Host to ME */
+#define E1000_H2ME_LSECREQ     0x00000001      /* Linksec Request */
+#define E1000_H2ME_LSECA       0x00000002      /* Linksec Active */
+#define E1000_H2ME_LSECSF      0x00000004      /* Linksec Failed */
+#define E1000_H2ME_LSECD       0x00000008      /* Linksec Disabled */
+#define E1000_H2ME_SLCAPD      0x00000010      /* Start LCAPD */
+#define E1000_H2ME_IPV4_ARP_EN 0x00000020      /* Arp Offload enable bit */
+#define E1000_H2ME_IPV6_NS_EN  0x00000040      /* NS Offload enable bit */
+
+#define ID_LED_DEFAULT_ICH8LAN ((ID_LED_DEF1_DEF2 << 12) | \
+                                (ID_LED_OFF1_OFF2 <<  8) | \
+                                (ID_LED_OFF1_ON2  <<  4) | \
+                                (ID_LED_DEF1_DEF2))
+
+#define E1000_ICH_NVM_SIG_WORD         0x13
+#define E1000_ICH_NVM_SIG_MASK         0xC000
+#define E1000_ICH_NVM_VALID_SIG_MASK   0xC0
+#define E1000_ICH_NVM_SIG_VALUE                0x80
+
+#define E1000_ICH8_LAN_INIT_TIMEOUT    1500
+
+#define E1000_FEXTNVM_SW_CONFIG                1
+#define E1000_FEXTNVM_SW_CONFIG_ICH8M  (1 << 27)       /* Bit redefined for ICH8M */
+
+#define E1000_FEXTNVM3 0x0003C /* Future Extended NVM 3 - RW */
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK    0x0C000000
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC  0x08000000
+
+#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 E1000_PCH2_RAR_ENTRIES 5       /* RAR[0], SHRA[0-3] */
+#define E1000_PCH_LPT_RAR_ENTRIES      12      /* RAR[0], SHRA[0-10] */
+
+#define PHY_PAGE_SHIFT         5
+#define PHY_REG(page, reg)     (((page) << PHY_PAGE_SHIFT) | \
+                                ((reg) & MAX_PHY_REG_ADDRESS))
+#define IGP3_KMRN_DIAG         PHY_REG(770, 19)        /* KMRN Diagnostic */
+#define IGP3_VR_CTRL           PHY_REG(776, 18)        /* Voltage Regulator Control */
+#define IGP3_CAPABILITY                PHY_REG(776, 19)        /* Capability */
+#define IGP3_PM_CTRL           PHY_REG(769, 20)        /* Power Management Control */
+
+#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS           0x0002
+#define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK   0x0300
+#define IGP3_VR_CTRL_MODE_SHUTDOWN             0x0200
+#define IGP3_PM_CTRL_FORCE_PWR_DOWN            0x0020
+
+/* PHY Wakeup Registers and defines */
+#define BM_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_IPAV                        (BM_PHY_REG(BM_WUC_PAGE, 64))
+#define BM_IP4AT_L(_i)         (BM_PHY_REG(BM_WUC_PAGE, 82 + ((_i) * 2)))
+#define BM_IP4AT_H(_i)         (BM_PHY_REG(BM_WUC_PAGE, 83 + ((_i) * 2)))
+
+#define BM_SHRAL_LOWER(_i)     (BM_PHY_REG(BM_WUC_PAGE, 44 + ((_i) * 4)))
+#define BM_SHRAL_UPPER(_i)     (BM_PHY_REG(BM_WUC_PAGE, 45 + ((_i) * 4)))
+#define BM_SHRAH_LOWER(_i)     (BM_PHY_REG(BM_WUC_PAGE, 46 + ((_i) * 4)))
+#define BM_SHRAH_UPPER(_i)     (BM_PHY_REG(BM_WUC_PAGE, 47 + ((_i) * 4)))
+
+#define I217_SHRAL_LOWER(_i)   (BM_PHY_REG(BM_WUC_PAGE, 20 + ((_i) * 4)))
+#define I217_SHRAL_UPPER(_i)   (BM_PHY_REG(BM_WUC_PAGE, 21 + ((_i) * 4)))
+#define I217_SHRAH_LOWER(_i)   (BM_PHY_REG(BM_WUC_PAGE, 22 + ((_i) * 4)))
+#define I217_SHRAH_UPPER(_i)   (BM_PHY_REG(BM_WUC_PAGE, 23 + ((_i) * 4)))
+
+#define BM_RCTL_UPE            0x0001  /* Unicast Promiscuous Mode */
+#define BM_RCTL_MPE            0x0002  /* Multicast Promiscuous Mode */
+#define BM_RCTL_MO_SHIFT       3       /* Multicast Offset Shift */
+#define BM_RCTL_MO_MASK                (3 << 3)        /* Multicast Offset Mask */
+#define BM_RCTL_BAM            0x0020  /* Broadcast Accept Mode */
+#define BM_RCTL_PMCF           0x0040  /* Pass MAC Control Frames */
+#define BM_RCTL_RFCE           0x0080  /* Rx Flow Control Enable */
+
+#define HV_LED_CONFIG          PHY_REG(768, 30)        /* LED Configuration */
+#define HV_MUX_DATA_CTRL       PHY_REG(776, 16)
+#define HV_MUX_DATA_CTRL_GEN_TO_MAC    0x0400
+#define HV_MUX_DATA_CTRL_FORCE_SPEED   0x0004
+#define HV_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 */
+
+/*
+ * For ICH, the name used for NVM word 17h is LED1 Config.
+ * For PCH, the word was re-named to OEM Config.
+ */
+#define E1000_NVM_LED1_CONFIG          0x17    /* NVM LED1/LPLU Config Word */
+#define E1000_NVM_LED1_CONFIG_LPLU_NONDOA 0x0400       /* NVM LPLU in non-D0a Bit */
+#define E1000_NVM_OEM_CONFIG           E1000_NVM_LED1_CONFIG
+#define E1000_NVM_OEM_CONFIG_LPLU_NONDOA E1000_NVM_LED1_CONFIG_LPLU_NONDOA
+
+#define E1000_NVM_K1_CONFIG    0x1B    /* NVM K1 Config Word */
+#define E1000_NVM_K1_ENABLE    0x1     /* NVM Enable K1 bit */
+
+/* SMBus Control Phy Register */
+#define CV_SMB_CTRL            PHY_REG(769, 23)
+#define CV_SMB_CTRL_FORCE_SMBUS        0x0001
+
+/* 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
+#define HV_SMB_ADDR_FREQ_MASK          0x1100
+#define HV_SMB_ADDR_FREQ_LOW_SHIFT     8
+#define HV_SMB_ADDR_FREQ_HIGH_SHIFT    12
+
+/* Strapping Option Register - RO */
+#define E1000_STRAP                    0x0000C
+#define E1000_STRAP_SMBUS_ADDRESS_MASK 0x00FE0000
+#define E1000_STRAP_SMBUS_ADDRESS_SHIFT        17
+#define E1000_STRAP_SMT_FREQ_MASK      0x00003000
+#define E1000_STRAP_SMT_FREQ_SHIFT     12
+
+/* OEM Bits Phy Register */
+#define HV_OEM_BITS            PHY_REG(768, 25)
+#define HV_OEM_BITS_LPLU       0x0004  /* Low Power Link Up */
+#define HV_OEM_BITS_GBE_DIS    0x0040  /* Gigabit Disable */
+#define HV_OEM_BITS_RESTART_AN 0x0400  /* Restart Auto-negotiation */
+
+#define LCD_CFG_PHY_ADDR_BIT   0x0020  /* Phy addr bit from LCD Config word */
+
+/* KMRN Mode Control */
+#define HV_KMRN_MODE_CTRL      PHY_REG(769, 16)
+#define HV_KMRN_MDIO_SLOW      0x0400
+
+/* KMRN FIFO Control and Status */
+#define HV_KMRN_FIFO_CTRLSTA                   PHY_REG(770, 16)
+#define HV_KMRN_FIFO_CTRLSTA_PREAMBLE_MASK     0x7000
+#define HV_KMRN_FIFO_CTRLSTA_PREAMBLE_SHIFT    12
+
+/* PHY Power Management Control */
+#define HV_PM_CTRL             PHY_REG(770, 17)
+#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA 0x100
+#define I217_MEM_PM_CFG                PHY_REG(772, 27)        /* I217 PHY Mem PM Cfg Reg */
+#define I217_MEM_PM_CFG_TXF_SD 0x0020  /* Tx FIFO Memories Shutdown */
+
+#define SW_FLAG_TIMEOUT                1000    /* SW Semaphore flag timeout in ms */
+
+/* PHY Low Power Idle Control */
+#define I82579_LPI_CTRL                                PHY_REG(772, 20)
+#define I82579_LPI_CTRL_ENABLE_MASK            0x6000
+#define I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT   0x80
+
+/* 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 */
+#define I82579_MSE_THRESHOLD   0x084F  /* Mean Square Error Threshold */
+#define I82579_MSE_LINK_DOWN   0x2411  /* MSE count before dropping link */
+#define I217_EEE_ADVERTISEMENT 0x8001  /* IEEE MMD Register 7.60 */
+#define I217_EEE_LP_ABILITY    0x8002  /* IEEE MMD Register 7.61 */
+#define I217_EEE_100_SUPPORTED (1 << 1)        /* 100BaseTx EEE supported */
+
+/* Intel Rapid Start Technology Support */
+#define I217_PROXY_CTRL                        PHY_REG(BM_WUC_PAGE, 70)
+#define I217_PROXY_CTRL_AUTO_DISABLE   0x0080
+#define I217_SxCTRL                    PHY_REG(BM_PORT_CTRL_PAGE, 28)
+#define I217_SxCTRL_MASK               0x1000
+#define I217_CGFREG                    PHY_REG(772, 29)
+#define I217_CGFREG_MASK               0x0002
+#define I217_MEMPWR                    PHY_REG(772, 26)
+#define I217_MEMPWR_MASK               0x0010
+
+/*
+ * Additional interrupts need to be handled for ICH family:
+ *  DSW = The FW changed the status of the DISSW bit in FWSM
+ *  PHYINT = The LAN connected device generates an interrupt
+ *  EPRST = Manageability reset event
+ */
+#define IMS_ICH_ENABLE_MASK (\
+       E1000_IMS_DSW   | \
+       E1000_IMS_PHYINT | \
+       E1000_IMS_EPRST)
+
+/* Additional interrupt register bit definitions */
+#define E1000_ICR_LSECPNC      0x00004000      /* PN threshold - client */
+#define E1000_IMS_LSECPNC      E1000_ICR_LSECPNC       /* PN threshold - client */
+#define E1000_ICS_LSECPNC      E1000_ICR_LSECPNC       /* PN threshold - client */
+
+/* Security Processing bit Indication */
+#define E1000_RXDEXT_LINKSEC_STATUS_LSECH      0x01000000
+#define E1000_RXDEXT_LINKSEC_ERROR_BIT_MASK    0x60000000
+#define E1000_RXDEXT_LINKSEC_ERROR_NO_SA_MATCH 0x20000000
+#define E1000_RXDEXT_LINKSEC_ERROR_REPLAY_ERROR        0x40000000
+#define E1000_RXDEXT_LINKSEC_ERROR_BAD_SIG     0x60000000
+
+/* Receive Address Initial CRC Calculation */
+#define E1000_PCH_RAICC(_n)    (0x05F50 + ((_n) * 4))
+
+void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
+                                                 bool state);
+void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
+void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw);
+void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw);
+void e1000_resume_workarounds_pchlan(struct e1000_hw *hw);
+s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
+void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
+s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
+#endif
diff --git a/drivers/net/e1000e/kcompat.c b/drivers/net/e1000e/kcompat.c
new file mode 100644 (file)
index 0000000..b88f530
--- /dev/null
@@ -0,0 +1,1081 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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 "kcompat.h"
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) )
+/* From lib/vsprintf.c */
+#include <asm/div64.h>
+
+static int skip_atoi(const char **s)
+{
+       int i = 0;
+
+       while (isdigit(**s))
+               i = i * 10 + *((*s)++) - '0';
+       return i;
+}
+
+#define _kc_ZEROPAD    1       /* pad with zero */
+#define _kc_SIGN       2       /* unsigned/signed long */
+#define _kc_PLUS       4       /* show plus */
+#define _kc_SPACE      8       /* space if plus */
+#define _kc_LEFT       16      /* left justified */
+#define _kc_SPECIAL    32      /* 0x */
+#define _kc_LARGE      64      /* use 'ABCDEF' instead of 'abcdef' */
+
+static char *number(char *buf, char *end, long long num, int base, int size,
+                   int precision, int type)
+{
+       char c, sign, tmp[66];
+       const char *digits;
+       const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+       const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+       int i;
+
+       digits = (type & _kc_LARGE) ? large_digits : small_digits;
+       if (type & _kc_LEFT)
+               type &= ~_kc_ZEROPAD;
+       if (base < 2 || base > 36)
+               return 0;
+       c = (type & _kc_ZEROPAD) ? '0' : ' ';
+       sign = 0;
+       if (type & _kc_SIGN) {
+               if (num < 0) {
+                       sign = '-';
+                       num = -num;
+                       size--;
+               } else if (type & _kc_PLUS) {
+                       sign = '+';
+                       size--;
+               } else if (type & _kc_SPACE) {
+                       sign = ' ';
+                       size--;
+               }
+       }
+       if (type & _kc_SPECIAL) {
+               if (base == 16)
+                       size -= 2;
+               else if (base == 8)
+                       size--;
+       }
+       i = 0;
+       if (num == 0)
+               tmp[i++] = '0';
+       else
+               while (num != 0)
+                       tmp[i++] = digits[do_div(num, base)];
+       if (i > precision)
+               precision = i;
+       size -= precision;
+       if (!(type & (_kc_ZEROPAD + _kc_LEFT))) {
+               while (size-- > 0) {
+                       if (buf <= end)
+                               *buf = ' ';
+                       ++buf;
+               }
+       }
+       if (sign) {
+               if (buf <= end)
+                       *buf = sign;
+               ++buf;
+       }
+       if (type & _kc_SPECIAL) {
+               if (base == 8) {
+                       if (buf <= end)
+                               *buf = '0';
+                       ++buf;
+               } else if (base == 16) {
+                       if (buf <= end)
+                               *buf = '0';
+                       ++buf;
+                       if (buf <= end)
+                               *buf = digits[33];
+                       ++buf;
+               }
+       }
+       if (!(type & _kc_LEFT)) {
+               while (size-- > 0) {
+                       if (buf <= end)
+                               *buf = c;
+                       ++buf;
+               }
+       }
+       while (i < precision--) {
+               if (buf <= end)
+                       *buf = '0';
+               ++buf;
+       }
+       while (i-- > 0) {
+               if (buf <= end)
+                       *buf = tmp[i];
+               ++buf;
+       }
+       while (size-- > 0) {
+               if (buf <= end)
+                       *buf = ' ';
+               ++buf;
+       }
+       return buf;
+}
+
+int _kc_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
+{
+       int len;
+       unsigned long long num;
+       int i, base;
+       char *str, *end, c;
+       const char *s;
+
+       int flags;              /* flags to number() */
+
+       int field_width;        /* width of output field */
+       int precision;          /* min. # of digits for integers; max
+                                  number of chars for from string */
+       int qualifier;          /* 'h', 'l', or 'L' for integer fields */
+       /* 'z' support added 23/7/1999 S.H.    */
+       /* 'z' changed to 'Z' --davidm 1/25/99 */
+
+       str = buf;
+       end = buf + size - 1;
+
+       if (end < buf - 1) {
+               end = ((void *)-1);
+               size = end - buf + 1;
+       }
+
+       for (; *fmt; ++fmt) {
+               if (*fmt != '%') {
+                       if (str <= end)
+                               *str = *fmt;
+                       ++str;
+                       continue;
+               }
+
+               /* process flags */
+               flags = 0;
+repeat:
+               ++fmt;          /* this also skips first '%' */
+               switch (*fmt) {
+               case '-':
+                       flags |= _kc_LEFT;
+                       goto repeat;
+               case '+':
+                       flags |= _kc_PLUS;
+                       goto repeat;
+               case ' ':
+                       flags |= _kc_SPACE;
+                       goto repeat;
+               case '#':
+                       flags |= _kc_SPECIAL;
+                       goto repeat;
+               case '0':
+                       flags |= _kc_ZEROPAD;
+                       goto repeat;
+               }
+
+               /* get field width */
+               field_width = -1;
+               if (isdigit(*fmt))
+                       field_width = skip_atoi(&fmt);
+               else if (*fmt == '*') {
+                       ++fmt;
+                       /* it's the next argument */
+                       field_width = va_arg(args, int);
+                       if (field_width < 0) {
+                               field_width = -field_width;
+                               flags |= _kc_LEFT;
+                       }
+               }
+
+               /* get the precision */
+               precision = -1;
+               if (*fmt == '.') {
+                       ++fmt;
+                       if (isdigit(*fmt))
+                               precision = skip_atoi(&fmt);
+                       else if (*fmt == '*') {
+                               ++fmt;
+                               /* it's the next argument */
+                               precision = va_arg(args, int);
+                       }
+                       if (precision < 0)
+                               precision = 0;
+               }
+
+               /* get the conversion qualifier */
+               qualifier = -1;
+               if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'Z') {
+                       qualifier = *fmt;
+                       ++fmt;
+               }
+
+               /* default base */
+               base = 10;
+
+               switch (*fmt) {
+               case 'c':
+                       if (!(flags & _kc_LEFT)) {
+                               while (--field_width > 0) {
+                                       if (str <= end)
+                                               *str = ' ';
+                                       ++str;
+                               }
+                       }
+                       c = (unsigned char)va_arg(args, int);
+                       if (str <= end)
+                               *str = c;
+                       ++str;
+                       while (--field_width > 0) {
+                               if (str <= end)
+                                       *str = ' ';
+                               ++str;
+                       }
+                       continue;
+
+               case 's':
+                       s = va_arg(args, char *);
+                       if (!s)
+                               s = "<NULL>";
+
+                       len = strnlen(s, precision);
+
+                       if (!(flags & _kc_LEFT)) {
+                               while (len < field_width--) {
+                                       if (str <= end)
+                                               *str = ' ';
+                                       ++str;
+                               }
+                       }
+                       for (i = 0; i < len; ++i) {
+                               if (str <= end)
+                                       *str = *s;
+                               ++str;
+                               ++s;
+                       }
+                       while (len < field_width--) {
+                               if (str <= end)
+                                       *str = ' ';
+                               ++str;
+                       }
+                       continue;
+
+               case 'p':
+                       if (field_width == -1) {
+                               field_width = 2 * sizeof(void *);
+                               flags |= _kc_ZEROPAD;
+                       }
+                       str = number(str, end,
+                                    (unsigned long)va_arg(args, void *),
+                                    16, field_width, precision, flags);
+                       continue;
+
+               case 'n':
+                       /* FIXME:
+                        * What does C99 say about the overflow case here? */
+                       if (qualifier == 'l') {
+                               long *ip = va_arg(args, long *);
+                               *ip = (str - buf);
+                       } else if (qualifier == 'Z') {
+                               size_t *ip = va_arg(args, size_t *);
+                               *ip = (str - buf);
+                       } else {
+                               int *ip = va_arg(args, int *);
+                               *ip = (str - buf);
+                       }
+                       continue;
+
+               case '%':
+                       if (str <= end)
+                               *str = '%';
+                       ++str;
+                       continue;
+
+                       /* integer number formats - set up the flags and "break" */
+               case 'o':
+                       base = 8;
+                       break;
+
+               case 'X':
+                       flags |= _kc_LARGE;
+               case 'x':
+                       base = 16;
+                       break;
+
+               case 'd':
+               case 'i':
+                       flags |= _kc_SIGN;
+               case 'u':
+                       break;
+
+               default:
+                       if (str <= end)
+                               *str = '%';
+                       ++str;
+                       if (*fmt) {
+                               if (str <= end)
+                                       *str = *fmt;
+                               ++str;
+                       } else {
+                               --fmt;
+                       }
+                       continue;
+               }
+               if (qualifier == 'L')
+                       num = va_arg(args, long long);
+               else if (qualifier == 'l') {
+                       num = va_arg(args, unsigned long);
+                       if (flags & _kc_SIGN)
+                               num = (signed long)num;
+               } else if (qualifier == 'Z') {
+                       num = va_arg(args, size_t);
+               } else if (qualifier == 'h') {
+                       num = (unsigned short)va_arg(args, int);
+                       if (flags & _kc_SIGN)
+                               num = (signed short)num;
+               } else {
+                       num = va_arg(args, unsigned int);
+                       if (flags & _kc_SIGN)
+                               num = (signed int)num;
+               }
+               str = number(str, end, num, base,
+                            field_width, precision, flags);
+       }
+       if (str <= end)
+               *str = '\0';
+       else if (size > 0)
+               /* don't write out a null byte if the buf size is zero */
+               *end = '\0';
+       /* the trailing null byte doesn't count towards the total
+        * ++str;
+        */
+       return str - buf;
+}
+
+int _kc_snprintf(char *buf, size_t size, const char *fmt, ...)
+{
+       va_list args;
+       int i;
+
+       va_start(args, fmt);
+       i = _kc_vsnprintf(buf, size, fmt, args);
+       va_end(args);
+       return i;
+}
+#endif /* < 2.4.8 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) )
+
+/**************************************/
+/* PCI DMA MAPPING */
+
+#if defined(CONFIG_HIGHMEM)
+
+#ifndef PCI_DRAM_OFFSET
+#define PCI_DRAM_OFFSET 0
+#endif
+
+u64
+_kc_pci_map_page(struct pci_dev *dev, struct page *page, unsigned long offset,
+                size_t size, int direction)
+{
+       return (((u64)(page - mem_map) << PAGE_SHIFT) + offset +
+               PCI_DRAM_OFFSET);
+}
+
+#else /* CONFIG_HIGHMEM */
+
+u64
+_kc_pci_map_page(struct pci_dev *dev, struct page *page, unsigned long offset,
+                size_t size, int direction)
+{
+       return pci_map_single(dev, (void *)page_address(page) + offset, size,
+                             direction);
+}
+
+#endif /* CONFIG_HIGHMEM */
+
+void
+_kc_pci_unmap_page(struct pci_dev *dev, u64 dma_addr, size_t size,
+                  int direction)
+{
+       return pci_unmap_single(dev, dma_addr, size, direction);
+}
+
+#endif /* 2.4.13 => 2.4.3 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) )
+
+/**************************************/
+/* PCI DRIVER API */
+
+int _kc_pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask)
+{
+       if (!pci_dma_supported(dev, mask))
+               return -EIO;
+       dev->dma_mask = mask;
+       return 0;
+}
+
+int _kc_pci_request_regions(struct pci_dev *dev, char *res_name)
+{
+       int i;
+
+       for (i = 0; i < 6; i++) {
+               if (pci_resource_len(dev, i) == 0)
+                       continue;
+
+               if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
+                       if (!request_region
+                           (pci_resource_start(dev, i),
+                            pci_resource_len(dev, i), res_name)) {
+                               pci_release_regions(dev);
+                               return -EBUSY;
+                       }
+               } else if (pci_resource_flags(dev, i) & IORESOURCE_MEM) {
+                       if (!request_mem_region
+                           (pci_resource_start(dev, i),
+                            pci_resource_len(dev, i), res_name)) {
+                               pci_release_regions(dev);
+                               return -EBUSY;
+                       }
+               }
+       }
+       return 0;
+}
+
+void _kc_pci_release_regions(struct pci_dev *dev)
+{
+       int i;
+
+       for (i = 0; i < 6; i++) {
+               if (pci_resource_len(dev, i) == 0)
+                       continue;
+
+               if (pci_resource_flags(dev, i) & IORESOURCE_IO)
+                       release_region(pci_resource_start(dev, i),
+                                      pci_resource_len(dev, i));
+
+               else if (pci_resource_flags(dev, i) & IORESOURCE_MEM)
+                       release_mem_region(pci_resource_start(dev, i),
+                                          pci_resource_len(dev, i));
+       }
+}
+
+/**************************************/
+/* NETWORK DRIVER API */
+
+struct net_device *_kc_alloc_etherdev(int sizeof_priv)
+{
+       struct net_device *dev;
+       int alloc_size;
+
+       alloc_size = sizeof(*dev) + sizeof_priv + IFNAMSIZ + 31;
+       dev = kzalloc(alloc_size, GFP_KERNEL);
+       if (!dev)
+               return NULL;
+
+       if (sizeof_priv)
+               dev->priv = (void *)(((unsigned long)(dev + 1) + 31) & ~31);
+       dev->name[0] = '\0';
+       ether_setup(dev);
+
+       return dev;
+}
+
+int _kc_is_valid_ether_addr(u8 *addr)
+{
+       const char zaddr[6] = { 0, };
+
+       return !(addr[0] & 1) && memcmp(addr, zaddr, 6);
+}
+
+#endif /* 2.4.3 => 2.4.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6) )
+
+int _kc_pci_set_power_state(struct pci_dev *dev, int state)
+{
+       return 0;
+}
+
+int _kc_pci_enable_wake(struct pci_dev *pdev, u32 state, int enable)
+{
+       return 0;
+}
+
+#endif /* 2.4.6 => 2.4.3 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
+void _kc_skb_fill_page_desc(struct sk_buff *skb, int i, struct page *page,
+                           int off, int size)
+{
+       skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+       frag->page = page;
+       frag->page_offset = off;
+       frag->size = size;
+       skb_shinfo(skb)->nr_frags = i + 1;
+}
+
+/*
+ * Original Copyright:
+ * find_next_bit.c: fallback find next bit implementation
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ */
+
+/**
+ * find_next_bit - find the next set bit in a memory region
+ * @addr: The address to base the search on
+ * @offset: The bitnumber to start searching at
+ * @size: The maximum size to search
+ */
+unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
+                           unsigned long offset)
+{
+       const unsigned long *p = addr + BITOP_WORD(offset);
+       unsigned long result = offset & ~(BITS_PER_LONG - 1);
+       unsigned long tmp;
+
+       if (offset >= size)
+               return size;
+       size -= result;
+       offset %= BITS_PER_LONG;
+       if (offset) {
+               tmp = *(p++);
+               tmp &= (~0UL << offset);
+               if (size < BITS_PER_LONG)
+                       goto found_first;
+               if (tmp)
+                       goto found_middle;
+               size -= BITS_PER_LONG;
+               result += BITS_PER_LONG;
+       }
+       while (size & ~(BITS_PER_LONG - 1)) {
+               if ((tmp = *(p++)))
+                       goto found_middle;
+               result += BITS_PER_LONG;
+               size -= BITS_PER_LONG;
+       }
+       if (!size)
+               return result;
+       tmp = *p;
+
+found_first:
+       tmp &= (~0UL >> (BITS_PER_LONG - size));
+       if (tmp == 0UL)         /* Are any bits set? */
+               return result + size;   /* Nope. */
+found_middle:
+       return result + ffs(tmp);
+}
+
+size_t _kc_strlcpy(char *dest, const char *src, size_t size)
+{
+       size_t ret = strlen(src);
+
+       if (size) {
+               size_t len = (ret >= size) ? size - 1 : ret;
+               memcpy(dest, src, len);
+               dest[len] = '\0';
+       }
+       return ret;
+}
+
+#endif /* 2.6.0 => 2.4.6 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) )
+int _kc_scnprintf(char *buf, size_t size, const char *fmt, ...)
+{
+       va_list args;
+       int i;
+
+       va_start(args, fmt);
+       i = vsnprintf(buf, size, fmt, args);
+       va_end(args);
+       return (i >= size) ? (size - 1) : i;
+}
+#endif /* < 2.6.4 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) )
+DECLARE_BITMAP(_kcompat_node_online_map, MAX_NUMNODES) = {
+1};
+#endif /* < 2.6.10 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) )
+char *_kc_kstrdup(const char *s, unsigned int gfp)
+{
+       size_t len;
+       char *buf;
+
+       if (!s)
+               return NULL;
+
+       len = strlen(s) + 1;
+       buf = kmalloc(len, gfp);
+       if (buf)
+               memcpy(buf, s, len);
+       return buf;
+}
+#endif /* < 2.6.13 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) )
+void *_kc_kzalloc(size_t size, int flags)
+{
+       void *ret = kmalloc(size, flags);
+       if (ret)
+               memset(ret, 0, size);
+       return ret;
+}
+#endif /* <= 2.6.13 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) )
+int _kc_skb_pad(struct sk_buff *skb, int pad)
+{
+       int ntail;
+
+       /* If the skbuff is non linear tailroom is always zero.. */
+       if (!skb_cloned(skb) && skb_tailroom(skb) >= pad) {
+               memset(skb->data + skb->len, 0, pad);
+               return 0;
+       }
+
+       ntail = skb->data_len + pad - (skb->end - skb->tail);
+       if (likely(skb_cloned(skb) || ntail > 0)) {
+               if (pskb_expand_head(skb, 0, ntail, GFP_ATOMIC)) ;
+               goto free_skb;
+       }
+#ifdef MAX_SKB_FRAGS
+       if (skb_is_nonlinear(skb) && !__pskb_pull_tail(skb, skb->data_len))
+               goto free_skb;
+
+#endif
+       memset(skb->data + skb->len, 0, pad);
+       return 0;
+
+free_skb:
+       kfree_skb(skb);
+       return -ENOMEM;
+}
+
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5,4)))
+int _kc_pci_save_state(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       int size = PCI_CONFIG_SPACE_LEN, i;
+       u16 pcie_cap_offset, pcie_link_status;
+
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) )
+       /* no ->dev for 2.4 kernels */
+       WARN_ON(pdev->dev.driver_data == NULL);
+#endif
+       pcie_cap_offset = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+       if (pcie_cap_offset) {
+               if (!pci_read_config_word(pdev,
+                                         pcie_cap_offset + PCIE_LINK_STATUS,
+                                         &pcie_link_status))
+                       size = PCIE_CONFIG_SPACE_LEN;
+       }
+       pci_config_space_ich8lan();
+#ifdef HAVE_PCI_ERS
+       if (adapter->config_space == NULL)
+#else
+       WARN_ON(adapter->config_space != NULL);
+#endif
+       adapter->config_space = kmalloc(size, GFP_KERNEL);
+       if (!adapter->config_space) {
+               printk(KERN_ERR "Out of memory in pci_save_state\n");
+               return -ENOMEM;
+       }
+       for (i = 0; i < (size / 4); i++)
+               pci_read_config_dword(pdev, i * 4, &adapter->config_space[i]);
+       return 0;
+}
+
+void _kc_pci_restore_state(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       int size = PCI_CONFIG_SPACE_LEN, i;
+       u16 pcie_cap_offset;
+       u16 pcie_link_status;
+
+       if (adapter->config_space != NULL) {
+               pcie_cap_offset = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+               if (pcie_cap_offset &&
+                   !pci_read_config_word(pdev,
+                                         pcie_cap_offset + PCIE_LINK_STATUS,
+                                         &pcie_link_status))
+                       size = PCIE_CONFIG_SPACE_LEN;
+
+               pci_config_space_ich8lan();
+               for (i = 0; i < (size / 4); i++)
+                       pci_write_config_dword(pdev, i * 4,
+                                              adapter->config_space[i]);
+#ifndef HAVE_PCI_ERS
+               kfree(adapter->config_space);
+               adapter->config_space = NULL;
+#endif
+       }
+}
+#endif /* !(RHEL_RELEASE_CODE >= RHEL 5.4) */
+
+#ifdef HAVE_PCI_ERS
+void _kc_free_netdev(struct net_device *netdev)
+{
+       struct adapter_struct *adapter = netdev_priv(netdev);
+
+       if (adapter->config_space != NULL)
+               kfree(adapter->config_space);
+#ifdef CONFIG_SYSFS
+       if (netdev->reg_state == NETREG_UNINITIALIZED) {
+               kfree((char *)netdev - netdev->padded);
+       } else {
+               BUG_ON(netdev->reg_state != NETREG_UNREGISTERED);
+               netdev->reg_state = NETREG_RELEASED;
+               class_device_put(&netdev->class_dev);
+       }
+#else
+       kfree((char *)netdev - netdev->padded);
+#endif
+}
+#endif
+
+void *_kc_kmemdup(const void *src, size_t len, unsigned gfp)
+{
+       void *p;
+
+       p = kzalloc(len, gfp);
+       if (p)
+               memcpy(p, src, len);
+       return p;
+}
+#endif /* <= 2.6.19 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) )
+/* hexdump code taken from lib/hexdump.c */
+static void _kc_hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
+                                  int groupsize, unsigned char *linebuf,
+                                  size_t linebuflen, bool ascii)
+{
+       const u8 *ptr = buf;
+       u8 ch;
+       int j, lx = 0;
+       int ascii_column;
+
+       if (rowsize != 16 && rowsize != 32)
+               rowsize = 16;
+
+       if (!len)
+               goto nil;
+       if (len > rowsize)      /* limit to one line at a time */
+               len = rowsize;
+       if ((len % groupsize) != 0)     /* no mixed size output */
+               groupsize = 1;
+
+       switch (groupsize) {
+       case 8:{
+                       const u64 *ptr8 = buf;
+                       int ngroups = len / groupsize;
+
+                       for (j = 0; j < ngroups; j++)
+                               lx +=
+                                   scnprintf((char *)(linebuf + lx),
+                                             linebuflen - lx, "%s%16.16llx",
+                                             j ? " " : "",
+                                             (unsigned long long)*(ptr8 + j));
+                       ascii_column = 17 * ngroups + 2;
+                       break;
+               }
+
+       case 4:{
+                       const u32 *ptr4 = buf;
+                       int ngroups = len / groupsize;
+
+                       for (j = 0; j < ngroups; j++)
+                               lx +=
+                                   scnprintf((char *)(linebuf + lx),
+                                             linebuflen - lx, "%s%8.8x",
+                                             j ? " " : "", *(ptr4 + j));
+                       ascii_column = 9 * ngroups + 2;
+                       break;
+               }
+
+       case 2:{
+                       const u16 *ptr2 = buf;
+                       int ngroups = len / groupsize;
+
+                       for (j = 0; j < ngroups; j++)
+                               lx +=
+                                   scnprintf((char *)(linebuf + lx),
+                                             linebuflen - lx, "%s%4.4x",
+                                             j ? " " : "", *(ptr2 + j));
+                       ascii_column = 5 * ngroups + 2;
+                       break;
+               }
+
+       default:
+               for (j = 0; (j < len) && (lx + 3) <= linebuflen; j++) {
+                       ch = ptr[j];
+                       linebuf[lx++] = hex_asc(ch >> 4);
+                       linebuf[lx++] = hex_asc(ch & 0x0f);
+                       linebuf[lx++] = ' ';
+               }
+               if (j)
+                       lx--;
+
+               ascii_column = 3 * rowsize + 2;
+               break;
+       }
+       if (!ascii)
+               goto nil;
+
+       while (lx < (linebuflen - 1) && lx < (ascii_column - 1))
+               linebuf[lx++] = ' ';
+       for (j = 0; (j < len) && (lx + 2) < linebuflen; j++)
+               linebuf[lx++] = (isascii(ptr[j]) && isprint(ptr[j])) ? ptr[j]
+                   : '.';
+nil:
+       linebuf[lx++] = '\0';
+}
+
+void _kc_print_hex_dump(const char *level,
+                       const char *prefix_str, int prefix_type,
+                       int rowsize, int groupsize,
+                       const void *buf, size_t len, bool ascii)
+{
+       const u8 *ptr = buf;
+       int i, linelen, remaining = len;
+       unsigned char linebuf[200];
+
+       if (rowsize != 16 && rowsize != 32)
+               rowsize = 16;
+
+       for (i = 0; i < len; i += rowsize) {
+               linelen = min(remaining, rowsize);
+               remaining -= rowsize;
+               _kc_hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize,
+                                      linebuf, sizeof(linebuf), ascii);
+
+               switch (prefix_type) {
+               case DUMP_PREFIX_ADDRESS:
+                       printk("%s%s%*p: %s\n", level, prefix_str,
+                              (int)(2 * sizeof(void *)), ptr + i, linebuf);
+                       break;
+               case DUMP_PREFIX_OFFSET:
+                       printk("%s%s%.8x: %s\n", level, prefix_str, i, linebuf);
+                       break;
+               default:
+                       printk("%s%s%s\n", level, prefix_str, linebuf);
+                       break;
+               }
+       }
+}
+#endif /* < 2.6.22 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) )
+#ifdef NAPI
+
+int __kc_adapter_clean(struct net_device *netdev, int *budget)
+{
+       int work_done;
+       int work_to_do = min(*budget, netdev->quota);
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       struct napi_struct *napi = &adapter->napi;
+       work_done = napi->poll(napi, work_to_do);
+       *budget -= work_done;
+       netdev->quota -= work_done;
+       return (work_done >= work_to_do) ? 1 : 0;
+}
+#endif /* NAPI */
+#endif /* <= 2.6.24 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) )
+void _kc_pci_disable_link_state(struct pci_dev *pdev, int state)
+{
+       struct pci_dev *parent = pdev->bus->self;
+       u16 link_state;
+       int pos;
+
+       if (!parent)
+               return;
+
+       pos = pci_find_capability(parent, PCI_CAP_ID_EXP);
+       if (pos) {
+               pci_read_config_word(parent, pos + PCI_EXP_LNKCTL, &link_state);
+               link_state &= ~state;
+               pci_write_config_word(parent, pos + PCI_EXP_LNKCTL, link_state);
+       }
+}
+#endif /* < 2.6.26 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) )
+#ifdef HAVE_TX_MQ
+void _kc_netif_tx_stop_all_queues(struct net_device *netdev)
+{
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       int i;
+
+       netif_stop_queue(netdev);
+       if (netif_is_multiqueue(netdev))
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       netif_stop_subqueue(netdev, i);
+}
+
+void _kc_netif_tx_wake_all_queues(struct net_device *netdev)
+{
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       int i;
+
+       netif_wake_queue(netdev);
+       if (netif_is_multiqueue(netdev))
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       netif_wake_subqueue(netdev, i);
+}
+
+void _kc_netif_tx_start_all_queues(struct net_device *netdev)
+{
+       struct adapter_struct *adapter = netdev_priv(netdev);
+       int i;
+
+       netif_start_queue(netdev);
+       if (netif_is_multiqueue(netdev))
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       netif_start_subqueue(netdev, i);
+}
+#endif /* HAVE_TX_MQ */
+
+#ifndef __WARN_printf
+void __kc_warn_slowpath(const char *file, int line, const char *fmt, ...)
+{
+       va_list args;
+
+       printk(KERN_WARNING "------------[ cut here ]------------\n");
+       printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file, line);
+       va_start(args, fmt);
+       vprintk(fmt, args);
+       va_end(args);
+
+       dump_stack();
+}
+#endif /* __WARN_printf */
+#endif /* < 2.6.27 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) )
+
+int _kc_pci_prepare_to_sleep(struct pci_dev *dev)
+{
+       pci_power_t target_state;
+       int error;
+
+       target_state = pci_choose_state(dev, PMSG_SUSPEND);
+
+       pci_enable_wake(dev, target_state, true);
+
+       error = pci_set_power_state(dev, target_state);
+
+       if (error)
+               pci_enable_wake(dev, target_state, false);
+
+       return error;
+}
+
+int _kc_pci_wake_from_d3(struct pci_dev *dev, bool enable)
+{
+       int err;
+
+       err = pci_enable_wake(dev, PCI_D3cold, enable);
+       if (err)
+               goto out;
+
+       err = pci_enable_wake(dev, PCI_D3hot, enable);
+
+out:
+       return err;
+}
+
+void _kc_skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page,
+                        int off, int size)
+{
+       skb_fill_page_desc(skb, i, page, off, size);
+       skb->len += size;
+       skb->data_len += size;
+       skb->truesize += size;
+}
+#endif /* < 2.6.28 */
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) )
+#endif /* < 2.6.35 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) )
+static const u32 _kc_flags_dup_features =
+    (ETH_FLAG_LRO | ETH_FLAG_NTUPLE | ETH_FLAG_RXHASH);
+
+u32 _kc_ethtool_op_get_flags(struct net_device *dev)
+{
+       return dev->features & _kc_flags_dup_features;
+}
+
+int _kc_ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported)
+{
+       if (data & ~supported)
+               return -EINVAL;
+
+       dev->features = ((dev->features & ~_kc_flags_dup_features) |
+                        (data & _kc_flags_dup_features));
+       return 0;
+}
+#endif /* < 2.6.36 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) )
+#endif /* < 2.6.38 */
+
+/******************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) )
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(6,0)))
+#endif /* !(RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(6,0)) */
+#endif /* < 2.6.39 */
diff --git a/drivers/net/e1000e/kcompat.h b/drivers/net/e1000e/kcompat.h
new file mode 100644 (file)
index 0000000..50a6007
--- /dev/null
@@ -0,0 +1,3082 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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 _KCOMPAT_H_
+#define _KCOMPAT_H_
+
+#ifndef LINUX_VERSION_CODE
+#include <linux/version.h>
+#else
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#endif
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/udp.h>
+#include <linux/mii.h>
+#include <linux/vmalloc.h>
+#include <asm/io.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+
+/* NAPI enable/disable flags here */
+#define NAPI
+#ifdef E1000E_NO_NAPI
+#undef NAPI
+#endif
+
+#define adapter_struct e1000_adapter
+#define CONFIG_E1000E_MSIX
+
+/* and finally set defines so that the code sees the changes */
+#ifdef NAPI
+#ifndef CONFIG_E1000E_NAPI
+#define CONFIG_E1000E_NAPI
+#endif
+#else
+#undef CONFIG_E1000E_NAPI
+#endif /* NAPI */
+
+/* packet split disable/enable */
+#ifdef DISABLE_PACKET_SPLIT
+#endif /* DISABLE_PACKET_SPLIT */
+
+/* MSI compatibility code for all kernels and drivers */
+#ifdef DISABLE_PCI_MSI
+#undef CONFIG_PCI_MSI
+#endif
+#ifndef CONFIG_PCI_MSI
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) )
+struct msix_entry {
+       u16 vector;             /* kernel uses to write allocated vector */
+       u16 entry;              /* driver uses to specify entry, OS writes */
+};
+#endif
+#undef pci_enable_msi
+#define pci_enable_msi(a) -ENOTSUPP
+#undef pci_disable_msi
+#define pci_disable_msi(a) do {} while (0)
+#undef pci_enable_msix
+#define pci_enable_msix(a, b, c) -ENOTSUPP
+#undef pci_disable_msix
+#define pci_disable_msix(a) do {} while (0)
+#define msi_remove_pci_irq_vectors(a) do {} while (0)
+#endif /* CONFIG_PCI_MSI */
+#ifdef DISABLE_PM
+#undef CONFIG_PM
+#endif
+
+#ifdef DISABLE_NET_POLL_CONTROLLER
+#undef CONFIG_NET_POLL_CONTROLLER
+#endif
+
+#ifndef PMSG_SUSPEND
+#define PMSG_SUSPEND 3
+#endif
+
+/* generic boolean compatibility */
+#undef TRUE
+#undef FALSE
+#define TRUE true
+#define FALSE false
+#ifdef GCC_VERSION
+#if ( GCC_VERSION < 3000 )
+#define _Bool char
+#endif
+#else
+#define _Bool char
+#endif
+
+/* kernels less than 2.4.14 don't have this */
+#ifndef ETH_P_8021Q
+#define ETH_P_8021Q 0x8100
+#endif
+
+#ifndef module_param
+#define module_param(v,t,p) MODULE_PARM(v, "i");
+#endif
+
+#ifndef DMA_64BIT_MASK
+#define DMA_64BIT_MASK  0xffffffffffffffffULL
+#endif
+
+#ifndef DMA_32BIT_MASK
+#define DMA_32BIT_MASK  0x00000000ffffffffULL
+#endif
+
+#ifndef PCI_CAP_ID_EXP
+#define PCI_CAP_ID_EXP 0x10
+#endif
+
+#ifndef PCIE_LINK_STATE_L0S
+#define PCIE_LINK_STATE_L0S 1
+#endif
+#ifndef PCIE_LINK_STATE_L1
+#define PCIE_LINK_STATE_L1 2
+#endif
+
+#ifndef mmiowb
+#ifdef CONFIG_IA64
+#define mmiowb() asm volatile ("mf.a" ::: "memory")
+#else
+#define mmiowb()
+#endif
+#endif
+
+#ifndef SET_NETDEV_DEV
+#define SET_NETDEV_DEV(net, pdev)
+#endif
+
+#if !defined(HAVE_FREE_NETDEV) && ( LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) )
+#define free_netdev(x) kfree(x)
+#endif
+
+#ifdef HAVE_POLL_CONTROLLER
+#define CONFIG_NET_POLL_CONTROLLER
+#endif
+
+#ifndef SKB_DATAREF_SHIFT
+/* if we do not have the infrastructure to detect if skb_header is cloned
+   just return false in all cases */
+#define skb_header_cloned(x) 0
+#endif
+
+#ifndef NETIF_F_GSO
+#define gso_size tso_size
+#define gso_segs tso_segs
+#endif
+
+#ifndef NETIF_F_GRO
+#define vlan_gro_receive(_napi, _vlgrp, _vlan, _skb) \
+               vlan_hwaccel_receive_skb(_skb, _vlgrp, _vlan)
+#define napi_gro_receive(_napi, _skb) netif_receive_skb(_skb)
+#endif
+
+#ifndef NETIF_F_SCTP_CSUM
+#define NETIF_F_SCTP_CSUM 0
+#endif
+
+#ifndef NETIF_F_LRO
+#define NETIF_F_LRO (1 << 15)
+#endif
+
+#ifndef NETIF_F_NTUPLE
+#define NETIF_F_NTUPLE (1 << 27)
+#endif
+
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+
+#ifndef CHECKSUM_PARTIAL
+#define CHECKSUM_PARTIAL CHECKSUM_HW
+#define CHECKSUM_COMPLETE CHECKSUM_HW
+#endif
+
+#ifndef __read_mostly
+#define __read_mostly
+#endif
+
+#ifndef MII_RESV1
+#define MII_RESV1              0x17    /* Reserved...          */
+#endif
+
+#ifndef unlikely
+#define unlikely(_x) _x
+#define likely(_x) _x
+#endif
+
+#ifndef WARN_ON
+#define WARN_ON(x)
+#endif
+
+#ifndef PCI_DEVICE
+#define PCI_DEVICE(vend,dev) \
+       .vendor = (vend), .device = (dev), \
+       .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
+#endif
+
+#ifndef node_online
+#define node_online(node) ((node) == 0)
+#endif
+
+#ifndef num_online_cpus
+#define num_online_cpus() smp_num_cpus
+#endif
+
+#ifndef cpu_online
+#define cpu_online(cpuid) test_bit((cpuid), &cpu_online_map)
+#endif
+
+#ifndef _LINUX_RANDOM_H
+#include <linux/random.h>
+#endif
+
+#ifndef DECLARE_BITMAP
+#ifndef BITS_TO_LONGS
+#define BITS_TO_LONGS(bits) (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
+#endif
+#define DECLARE_BITMAP(name,bits) long name[BITS_TO_LONGS(bits)]
+#endif
+
+#ifndef VLAN_HLEN
+#define VLAN_HLEN 4
+#endif
+
+#ifndef VLAN_ETH_HLEN
+#define VLAN_ETH_HLEN 18
+#endif
+
+#ifndef VLAN_ETH_FRAME_LEN
+#define VLAN_ETH_FRAME_LEN 1518
+#endif
+
+#if !defined(IXGBE_DCA) && !defined(IGB_DCA)
+#define dca_get_tag(b) 0
+#define dca_add_requester(a) -1
+#define dca_remove_requester(b) do { } while(0)
+#define DCA_PROVIDER_ADD     0x0001
+#define DCA_PROVIDER_REMOVE  0x0002
+#endif
+
+#ifndef DCA_GET_TAG_TWO_ARGS
+#define dca3_get_tag(a,b) dca_get_tag(b)
+#endif
+
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+#if defined(__i386__) || defined(__x86_64__)
+#define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+#endif
+#endif
+
+/* taken from 2.6.24 definition in linux/kernel.h */
+#ifndef IS_ALIGNED
+#define IS_ALIGNED(x,a)         (((x) % ((typeof(x))(a))) == 0)
+#endif
+
+#ifndef NETIF_F_HW_VLAN_TX
+struct _kc_vlan_ethhdr {
+       unsigned char h_dest[ETH_ALEN];
+       unsigned char h_source[ETH_ALEN];
+       __be16 h_vlan_proto;
+       __be16 h_vlan_TCI;
+       __be16 h_vlan_encapsulated_proto;
+};
+#define vlan_ethhdr _kc_vlan_ethhdr
+struct _kc_vlan_hdr {
+       __be16 h_vlan_TCI;
+       __be16 h_vlan_encapsulated_proto;
+};
+#define vlan_hdr _kc_vlan_hdr
+#define vlan_tx_tag_present(_skb) 0
+#define vlan_tx_tag_get(_skb) 0
+#endif
+
+#ifndef VLAN_PRIO_SHIFT
+#define VLAN_PRIO_SHIFT 13
+#endif
+
+#ifndef __GFP_COLD
+#define __GFP_COLD 0
+#endif
+
+/*****************************************************************************/
+/* Installations with ethtool version without eeprom, adapter id, or statistics
+ * support */
+
+#ifndef ETH_GSTRING_LEN
+#define ETH_GSTRING_LEN 32
+#endif
+
+#ifndef ETHTOOL_GSTATS
+#define ETHTOOL_GSTATS 0x1d
+#undef ethtool_drvinfo
+#define ethtool_drvinfo k_ethtool_drvinfo
+struct k_ethtool_drvinfo {
+       u32 cmd;
+       char driver[32];
+       char version[32];
+       char fw_version[32];
+       char bus_info[32];
+       char reserved1[32];
+       char reserved2[16];
+       u32 n_stats;
+       u32 testinfo_len;
+       u32 eedump_len;
+       u32 regdump_len;
+};
+
+struct ethtool_stats {
+       u32 cmd;
+       u32 n_stats;
+       u64 data[0];
+};
+#endif /* ETHTOOL_GSTATS */
+
+#ifndef ETHTOOL_PHYS_ID
+#define ETHTOOL_PHYS_ID 0x1c
+#endif /* ETHTOOL_PHYS_ID */
+
+#ifndef ETHTOOL_GSTRINGS
+#define ETHTOOL_GSTRINGS 0x1b
+enum ethtool_stringset {
+       ETH_SS_TEST = 0,
+       ETH_SS_STATS,
+};
+struct ethtool_gstrings {
+       u32 cmd;                /* ETHTOOL_GSTRINGS */
+       u32 string_set;         /* string set id e.c. ETH_SS_TEST, etc */
+       u32 len;                /* number of strings in the string set */
+       u8 data[0];
+};
+#endif /* ETHTOOL_GSTRINGS */
+
+#ifndef ETHTOOL_TEST
+#define ETHTOOL_TEST 0x1a
+enum ethtool_test_flags {
+       ETH_TEST_FL_OFFLINE = (1 << 0),
+       ETH_TEST_FL_FAILED = (1 << 1),
+};
+struct ethtool_test {
+       u32 cmd;
+       u32 flags;
+       u32 reserved;
+       u32 len;
+       u64 data[0];
+};
+#endif /* ETHTOOL_TEST */
+
+#ifndef ETHTOOL_GEEPROM
+#define ETHTOOL_GEEPROM 0xb
+#undef ETHTOOL_GREGS
+struct ethtool_eeprom {
+       u32 cmd;
+       u32 magic;
+       u32 offset;
+       u32 len;
+       u8 data[0];
+};
+
+struct ethtool_value {
+       u32 cmd;
+       u32 data;
+};
+#endif /* ETHTOOL_GEEPROM */
+
+#ifndef ETHTOOL_GLINK
+#define ETHTOOL_GLINK 0xa
+#endif /* ETHTOOL_GLINK */
+
+#ifndef ETHTOOL_GWOL
+#define ETHTOOL_GWOL 0x5
+#define ETHTOOL_SWOL 0x6
+#define SOPASS_MAX      6
+struct ethtool_wolinfo {
+       u32 cmd;
+       u32 supported;
+       u32 wolopts;
+       u8 sopass[SOPASS_MAX];  /* SecureOn(tm) password */
+};
+#endif /* ETHTOOL_GWOL */
+
+#ifndef ETHTOOL_GREGS
+#define ETHTOOL_GREGS          0x00000004      /* Get NIC registers */
+#define ethtool_regs _kc_ethtool_regs
+/* for passing big chunks of data */
+struct _kc_ethtool_regs {
+       u32 cmd;
+       u32 version;            /* driver-specific, indicates different chips/revs */
+       u32 len;                /* bytes */
+       u8 data[0];
+};
+#endif /* ETHTOOL_GREGS */
+
+#ifndef ETHTOOL_GMSGLVL
+#define ETHTOOL_GMSGLVL                0x00000007      /* Get driver message level */
+#endif
+#ifndef ETHTOOL_SMSGLVL
+#define ETHTOOL_SMSGLVL                0x00000008      /* Set driver msg level, priv. */
+#endif
+#ifndef ETHTOOL_NWAY_RST
+#define ETHTOOL_NWAY_RST       0x00000009      /* Restart autonegotiation, priv */
+#endif
+#ifndef ETHTOOL_GLINK
+#define ETHTOOL_GLINK          0x0000000a      /* Get link status */
+#endif
+#ifndef ETHTOOL_GEEPROM
+#define ETHTOOL_GEEPROM                0x0000000b      /* Get EEPROM data */
+#endif
+#ifndef ETHTOOL_SEEPROM
+#define ETHTOOL_SEEPROM                0x0000000c      /* Set EEPROM data */
+#endif
+#ifndef ETHTOOL_GCOALESCE
+#define ETHTOOL_GCOALESCE      0x0000000e      /* Get coalesce config */
+/* for configuring coalescing parameters of chip */
+#define ethtool_coalesce _kc_ethtool_coalesce
+struct _kc_ethtool_coalesce {
+       u32 cmd;                /* ETHTOOL_{G,S}COALESCE */
+
+       /* How many usecs to delay an RX interrupt after
+        * a packet arrives.  If 0, only rx_max_coalesced_frames
+        * is used.
+        */
+       u32 rx_coalesce_usecs;
+
+       /* How many packets to delay an RX interrupt after
+        * a packet arrives.  If 0, only rx_coalesce_usecs is
+        * used.  It is illegal to set both usecs and max frames
+        * to zero as this would cause RX interrupts to never be
+        * generated.
+        */
+       u32 rx_max_coalesced_frames;
+
+       /* Same as above two parameters, except that these values
+        * apply while an IRQ is being serviced by the host.  Not
+        * all cards support this feature and the values are ignored
+        * in that case.
+        */
+       u32 rx_coalesce_usecs_irq;
+       u32 rx_max_coalesced_frames_irq;
+
+       /* How many usecs to delay a TX interrupt after
+        * a packet is sent.  If 0, only tx_max_coalesced_frames
+        * is used.
+        */
+       u32 tx_coalesce_usecs;
+
+       /* How many packets to delay a TX interrupt after
+        * a packet is sent.  If 0, only tx_coalesce_usecs is
+        * used.  It is illegal to set both usecs and max frames
+        * to zero as this would cause TX interrupts to never be
+        * generated.
+        */
+       u32 tx_max_coalesced_frames;
+
+       /* Same as above two parameters, except that these values
+        * apply while an IRQ is being serviced by the host.  Not
+        * all cards support this feature and the values are ignored
+        * in that case.
+        */
+       u32 tx_coalesce_usecs_irq;
+       u32 tx_max_coalesced_frames_irq;
+
+       /* How many usecs to delay in-memory statistics
+        * block updates.  Some drivers do not have an in-memory
+        * statistic block, and in such cases this value is ignored.
+        * This value must not be zero.
+        */
+       u32 stats_block_coalesce_usecs;
+
+       /* Adaptive RX/TX coalescing is an algorithm implemented by
+        * some drivers to improve latency under low packet rates and
+        * improve throughput under high packet rates.  Some drivers
+        * only implement one of RX or TX adaptive coalescing.  Anything
+        * not implemented by the driver causes these values to be
+        * silently ignored.
+        */
+       u32 use_adaptive_rx_coalesce;
+       u32 use_adaptive_tx_coalesce;
+
+       /* When the packet rate (measured in packets per second)
+        * is below pkt_rate_low, the {rx,tx}_*_low parameters are
+        * used.
+        */
+       u32 pkt_rate_low;
+       u32 rx_coalesce_usecs_low;
+       u32 rx_max_coalesced_frames_low;
+       u32 tx_coalesce_usecs_low;
+       u32 tx_max_coalesced_frames_low;
+
+       /* When the packet rate is below pkt_rate_high but above
+        * pkt_rate_low (both measured in packets per second) the
+        * normal {rx,tx}_* coalescing parameters are used.
+        */
+
+       /* When the packet rate is (measured in packets per second)
+        * is above pkt_rate_high, the {rx,tx}_*_high parameters are
+        * used.
+        */
+       u32 pkt_rate_high;
+       u32 rx_coalesce_usecs_high;
+       u32 rx_max_coalesced_frames_high;
+       u32 tx_coalesce_usecs_high;
+       u32 tx_max_coalesced_frames_high;
+
+       /* How often to do adaptive coalescing packet rate sampling,
+        * measured in seconds.  Must not be zero.
+        */
+       u32 rate_sample_interval;
+};
+#endif /* ETHTOOL_GCOALESCE */
+
+#ifndef ETHTOOL_SCOALESCE
+#define ETHTOOL_SCOALESCE      0x0000000f      /* Set coalesce config. */
+#endif
+#ifndef ETHTOOL_GRINGPARAM
+#define ETHTOOL_GRINGPARAM     0x00000010      /* Get ring parameters */
+/* for configuring RX/TX ring parameters */
+#define ethtool_ringparam _kc_ethtool_ringparam
+struct _kc_ethtool_ringparam {
+       u32 cmd;                /* ETHTOOL_{G,S}RINGPARAM */
+
+       /* Read only attributes.  These indicate the maximum number
+        * of pending RX/TX ring entries the driver will allow the
+        * user to set.
+        */
+       u32 rx_max_pending;
+       u32 rx_mini_max_pending;
+       u32 rx_jumbo_max_pending;
+       u32 tx_max_pending;
+
+       /* Values changeable by the user.  The valid values are
+        * in the range 1 to the "*_max_pending" counterpart above.
+        */
+       u32 rx_pending;
+       u32 rx_mini_pending;
+       u32 rx_jumbo_pending;
+       u32 tx_pending;
+};
+#endif /* ETHTOOL_GRINGPARAM */
+
+#ifndef ETHTOOL_SRINGPARAM
+#define ETHTOOL_SRINGPARAM     0x00000011      /* Set ring parameters, priv. */
+#endif
+#ifndef ETHTOOL_GPAUSEPARAM
+#define ETHTOOL_GPAUSEPARAM    0x00000012      /* Get pause parameters */
+/* for configuring link flow control parameters */
+#define ethtool_pauseparam _kc_ethtool_pauseparam
+struct _kc_ethtool_pauseparam {
+       u32 cmd;                /* ETHTOOL_{G,S}PAUSEPARAM */
+
+       /* If the link is being auto-negotiated (via ethtool_cmd.autoneg
+        * being true) the user may set 'autoneg' here non-zero to have the
+        * pause parameters be auto-negotiated too.  In such a case, the
+        * {rx,tx}_pause values below determine what capabilities are
+        * advertised.
+        *
+        * If 'autoneg' is zero or the link is not being auto-negotiated,
+        * then {rx,tx}_pause force the driver to use/not-use pause
+        * flow control.
+        */
+       u32 autoneg;
+       u32 rx_pause;
+       u32 tx_pause;
+};
+#endif /* ETHTOOL_GPAUSEPARAM */
+
+#ifndef ETHTOOL_SPAUSEPARAM
+#define ETHTOOL_SPAUSEPARAM    0x00000013      /* Set pause parameters. */
+#endif
+#ifndef ETHTOOL_GRXCSUM
+#define ETHTOOL_GRXCSUM                0x00000014      /* Get RX hw csum enable (ethtool_value) */
+#endif
+#ifndef ETHTOOL_SRXCSUM
+#define ETHTOOL_SRXCSUM                0x00000015      /* Set RX hw csum enable (ethtool_value) */
+#endif
+#ifndef ETHTOOL_GTXCSUM
+#define ETHTOOL_GTXCSUM                0x00000016      /* Get TX hw csum enable (ethtool_value) */
+#endif
+#ifndef ETHTOOL_STXCSUM
+#define ETHTOOL_STXCSUM                0x00000017      /* Set TX hw csum enable (ethtool_value) */
+#endif
+#ifndef ETHTOOL_GSG
+#define ETHTOOL_GSG            0x00000018      /* Get scatter-gather enable
+                                                * (ethtool_value) */
+#endif
+#ifndef ETHTOOL_SSG
+#define ETHTOOL_SSG            0x00000019      /* Set scatter-gather enable
+                                                * (ethtool_value). */
+#endif
+#ifndef ETHTOOL_TEST
+#define ETHTOOL_TEST           0x0000001a      /* execute NIC self-test, priv. */
+#endif
+#ifndef ETHTOOL_GSTRINGS
+#define ETHTOOL_GSTRINGS       0x0000001b      /* get specified string set */
+#endif
+#ifndef ETHTOOL_PHYS_ID
+#define ETHTOOL_PHYS_ID                0x0000001c      /* identify the NIC */
+#endif
+#ifndef ETHTOOL_GSTATS
+#define ETHTOOL_GSTATS         0x0000001d      /* get NIC-specific statistics */
+#endif
+#ifndef ETHTOOL_GTSO
+#define ETHTOOL_GTSO           0x0000001e      /* Get TSO enable (ethtool_value) */
+#endif
+#ifndef ETHTOOL_STSO
+#define ETHTOOL_STSO           0x0000001f      /* Set TSO enable (ethtool_value) */
+#endif
+
+#ifndef ETHTOOL_BUSINFO_LEN
+#define ETHTOOL_BUSINFO_LEN    32
+#endif
+
+#ifndef RHEL_RELEASE_CODE
+/* NOTE: RHEL_RELEASE_* introduced in RHEL4.5 */
+#define RHEL_RELEASE_CODE 0
+#endif
+#ifndef RHEL_RELEASE_VERSION
+#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))
+#endif
+#ifndef AX_RELEASE_CODE
+#define AX_RELEASE_CODE 0
+#endif
+#ifndef AX_RELEASE_VERSION
+#define AX_RELEASE_VERSION(a,b) (((a) << 8) + (b))
+#endif
+
+/* SuSE version macro is the same as Linux kernel version */
+#ifndef SLE_VERSION
+#define SLE_VERSION(a,b,c) KERNEL_VERSION(a,b,c)
+#endif
+#ifndef SLE_VERSION_CODE
+#ifdef CONFIG_SUSE_KERNEL
+/* SLES11 GA is 2.6.27 based */
+#if ( LINUX_VERSION_CODE == KERNEL_VERSION(2,6,27) )
+#define SLE_VERSION_CODE SLE_VERSION(11,0,0)
+#elif ( LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32) )
+/* SLES11 SP1 is 2.6.32 based */
+#define SLE_VERSION_CODE SLE_VERSION(11,1,0)
+#else
+#define SLE_VERSION_CODE 0
+#endif
+#else /* CONFIG_SUSE_KERNEL */
+#define SLE_VERSION_CODE 0
+#endif /* CONFIG_SUSE_KERNEL */
+#endif /* SLE_VERSION_CODE */
+
+#ifdef __KLOCWORK__
+#ifdef ARRAY_SIZE
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+#endif /* __KLOCWORK__ */
+
+/*****************************************************************************/
+/* 2.4.3 => 2.4.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) )
+
+/**************************************/
+/* PCI DRIVER API */
+
+#ifndef pci_set_dma_mask
+#define pci_set_dma_mask _kc_pci_set_dma_mask
+extern int _kc_pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask);
+#endif
+
+#ifndef pci_request_regions
+#define pci_request_regions _kc_pci_request_regions
+extern int _kc_pci_request_regions(struct pci_dev *pdev, char *res_name);
+#endif
+
+#ifndef pci_release_regions
+#define pci_release_regions _kc_pci_release_regions
+extern void _kc_pci_release_regions(struct pci_dev *pdev);
+#endif
+
+/**************************************/
+/* NETWORK DRIVER API */
+
+#ifndef alloc_etherdev
+#define alloc_etherdev _kc_alloc_etherdev
+extern struct net_device *_kc_alloc_etherdev(int sizeof_priv);
+#endif
+
+#ifndef is_valid_ether_addr
+#define is_valid_ether_addr _kc_is_valid_ether_addr
+extern int _kc_is_valid_ether_addr(u8 *addr);
+#endif
+
+/**************************************/
+/* MISCELLANEOUS */
+
+#ifndef INIT_TQUEUE
+#define INIT_TQUEUE(_tq, _routine, _data)              \
+       do {                                            \
+               INIT_LIST_HEAD(&(_tq)->list);           \
+               (_tq)->sync = 0;                        \
+               (_tq)->routine = _routine;              \
+               (_tq)->data = _data;                    \
+       } while (0)
+#endif
+
+#endif /* 2.4.3 => 2.4.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) )
+/* Generic MII registers. */
+#define MII_BMCR            0x00       /* Basic mode control register */
+#define MII_BMSR            0x01       /* Basic mode status register  */
+#define MII_PHYSID1         0x02       /* PHYS ID 1                   */
+#define MII_PHYSID2         0x03       /* PHYS ID 2                   */
+#define MII_ADVERTISE       0x04       /* Advertisement control reg   */
+#define MII_LPA             0x05       /* Link partner ability reg    */
+#define MII_EXPANSION       0x06       /* Expansion register          */
+/* Basic mode control register. */
+#define BMCR_FULLDPLX           0x0100 /* Full duplex                 */
+#define BMCR_ANENABLE           0x1000 /* Enable auto negotiation     */
+/* Basic mode status register. */
+#define BMSR_ERCAP              0x0001 /* Ext-reg capability          */
+#define BMSR_ANEGCAPABLE        0x0008 /* Able to do auto-negotiation */
+#define BMSR_10HALF             0x0800 /* Can do 10mbps, half-duplex  */
+#define BMSR_10FULL             0x1000 /* Can do 10mbps, full-duplex  */
+#define BMSR_100HALF            0x2000 /* Can do 100mbps, half-duplex */
+#define BMSR_100FULL            0x4000 /* Can do 100mbps, full-duplex */
+/* Advertisement control register. */
+#define ADVERTISE_CSMA          0x0001 /* Only selector supported     */
+#define ADVERTISE_10HALF        0x0020 /* Try for 10mbps half-duplex  */
+#define ADVERTISE_10FULL        0x0040 /* Try for 10mbps full-duplex  */
+#define ADVERTISE_100HALF       0x0080 /* Try for 100mbps half-duplex */
+#define ADVERTISE_100FULL       0x0100 /* Try for 100mbps full-duplex */
+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+                       ADVERTISE_100HALF | ADVERTISE_100FULL)
+/* Expansion register for auto-negotiation. */
+#define EXPANSION_ENABLENPAGE   0x0004 /* This enables npage words    */
+#endif
+
+/*****************************************************************************/
+/* 2.4.6 => 2.4.3 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6) )
+
+#ifndef pci_set_power_state
+#define pci_set_power_state _kc_pci_set_power_state
+extern int _kc_pci_set_power_state(struct pci_dev *dev, int state);
+#endif
+
+#ifndef pci_enable_wake
+#define pci_enable_wake _kc_pci_enable_wake
+extern int _kc_pci_enable_wake(struct pci_dev *pdev, u32 state, int enable);
+#endif
+
+#ifndef pci_disable_device
+#define pci_disable_device _kc_pci_disable_device
+extern void _kc_pci_disable_device(struct pci_dev *pdev);
+#endif
+
+/* PCI PM entry point syntax changed, so don't support suspend/resume */
+#undef CONFIG_PM
+
+#endif /* 2.4.6 => 2.4.3 */
+
+#ifndef HAVE_PCI_SET_MWI
+#define pci_set_mwi(X) pci_write_config_word(X, \
+                              PCI_COMMAND, adapter->hw.bus.pci_cmd_word | \
+                              PCI_COMMAND_INVALIDATE);
+#define pci_clear_mwi(X) pci_write_config_word(X, \
+                              PCI_COMMAND, adapter->hw.bus.pci_cmd_word & \
+                              ~PCI_COMMAND_INVALIDATE);
+#endif
+
+/*****************************************************************************/
+/* 2.4.10 => 2.4.9 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10) )
+
+/**************************************/
+/* MODULE API */
+
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(X)
+#endif
+
+/**************************************/
+/* OTHER */
+
+#undef min
+#define min(x,y) ({ \
+       const typeof(x) _x = (x);       \
+       const typeof(y) _y = (y);       \
+       (void) (&_x == &_y);            \
+       _x < _y ? _x : _y; })
+
+#undef max
+#define max(x,y) ({ \
+       const typeof(x) _x = (x);       \
+       const typeof(y) _y = (y);       \
+       (void) (&_x == &_y);            \
+       _x > _y ? _x : _y; })
+
+#define min_t(type,x,y) ({ \
+       type _x = (x); \
+       type _y = (y); \
+       _x < _y ? _x : _y; })
+
+#define max_t(type,x,y) ({ \
+       type _x = (x); \
+       type _y = (y); \
+       _x > _y ? _x : _y; })
+
+#ifndef list_for_each_safe
+#define list_for_each_safe(pos, n, head) \
+       for (pos = (head)->next, n = pos->next; pos != (head); \
+               pos = n, n = pos->next)
+#endif
+
+#ifndef ____cacheline_aligned_in_smp
+#ifdef CONFIG_SMP
+#define ____cacheline_aligned_in_smp ____cacheline_aligned
+#else
+#define ____cacheline_aligned_in_smp
+#endif /* CONFIG_SMP */
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) )
+extern int _kc_snprintf(char *buf, size_t size, const char *fmt, ...);
+#define snprintf(buf, size, fmt, args...) _kc_snprintf(buf, size, fmt, ##args)
+extern int _kc_vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
+#define vsnprintf(buf, size, fmt, args) _kc_vsnprintf(buf, size, fmt, args)
+#else /* 2.4.8 => 2.4.9 */
+extern int snprintf(char *buf, size_t size, const char *fmt, ...);
+extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
+#endif
+#endif /* 2.4.10 -> 2.4.6 */
+
+/*****************************************************************************/
+/* 2.4.12 => 2.4.10 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,12) )
+#ifndef HAVE_NETIF_MSG
+#define HAVE_NETIF_MSG 1
+enum {
+       NETIF_MSG_DRV = 0x0001,
+       NETIF_MSG_PROBE = 0x0002,
+       NETIF_MSG_LINK = 0x0004,
+       NETIF_MSG_TIMER = 0x0008,
+       NETIF_MSG_IFDOWN = 0x0010,
+       NETIF_MSG_IFUP = 0x0020,
+       NETIF_MSG_RX_ERR = 0x0040,
+       NETIF_MSG_TX_ERR = 0x0080,
+       NETIF_MSG_TX_QUEUED = 0x0100,
+       NETIF_MSG_INTR = 0x0200,
+       NETIF_MSG_TX_DONE = 0x0400,
+       NETIF_MSG_RX_STATUS = 0x0800,
+       NETIF_MSG_PKTDATA = 0x1000,
+       NETIF_MSG_HW = 0x2000,
+       NETIF_MSG_WOL = 0x4000,
+};
+
+#define netif_msg_drv(p)       ((p)->msg_enable & NETIF_MSG_DRV)
+#define netif_msg_probe(p)     ((p)->msg_enable & NETIF_MSG_PROBE)
+#define netif_msg_link(p)      ((p)->msg_enable & NETIF_MSG_LINK)
+#define netif_msg_timer(p)     ((p)->msg_enable & NETIF_MSG_TIMER)
+#define netif_msg_ifdown(p)    ((p)->msg_enable & NETIF_MSG_IFDOWN)
+#define netif_msg_ifup(p)      ((p)->msg_enable & NETIF_MSG_IFUP)
+#define netif_msg_rx_err(p)    ((p)->msg_enable & NETIF_MSG_RX_ERR)
+#define netif_msg_tx_err(p)    ((p)->msg_enable & NETIF_MSG_TX_ERR)
+#define netif_msg_tx_queued(p) ((p)->msg_enable & NETIF_MSG_TX_QUEUED)
+#define netif_msg_intr(p)      ((p)->msg_enable & NETIF_MSG_INTR)
+#define netif_msg_tx_done(p)   ((p)->msg_enable & NETIF_MSG_TX_DONE)
+#define netif_msg_rx_status(p) ((p)->msg_enable & NETIF_MSG_RX_STATUS)
+#define netif_msg_pktdata(p)   ((p)->msg_enable & NETIF_MSG_PKTDATA)
+#endif /* !HAVE_NETIF_MSG */
+#endif /* 2.4.12 => 2.4.10 */
+
+/*****************************************************************************/
+/* 2.4.13 => 2.4.12 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) )
+
+/**************************************/
+/* PCI DMA MAPPING */
+
+#ifndef virt_to_page
+#define virt_to_page(v) (mem_map + (virt_to_phys(v) >> PAGE_SHIFT))
+#endif
+
+#ifndef pci_map_page
+#define pci_map_page _kc_pci_map_page
+extern u64 _kc_pci_map_page(struct pci_dev *dev, struct page *page,
+                           unsigned long offset, size_t size, int direction);
+#endif
+
+#ifndef pci_unmap_page
+#define pci_unmap_page _kc_pci_unmap_page
+extern void _kc_pci_unmap_page(struct pci_dev *dev, u64 dma_addr, size_t size,
+                              int direction);
+#endif
+
+/* pci_set_dma_mask takes dma_addr_t, which is only 32-bits prior to 2.4.13 */
+
+#undef DMA_32BIT_MASK
+#define DMA_32BIT_MASK 0xffffffff
+#undef DMA_64BIT_MASK
+#define DMA_64BIT_MASK 0xffffffff
+
+/**************************************/
+/* OTHER */
+
+#ifndef cpu_relax
+#define cpu_relax()    rep_nop()
+#endif
+
+struct vlan_ethhdr {
+       unsigned char h_dest[ETH_ALEN];
+       unsigned char h_source[ETH_ALEN];
+       unsigned short h_vlan_proto;
+       unsigned short h_vlan_TCI;
+       unsigned short h_vlan_encapsulated_proto;
+};
+#endif /* 2.4.13 => 2.4.12 */
+
+/*****************************************************************************/
+/* 2.4.17 => 2.4.12 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,17) )
+
+#ifndef __devexit_p
+#define __devexit_p(x) &(x)
+#endif
+
+#endif /* 2.4.17 => 2.4.13 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) )
+#define NETIF_MSG_HW   0x2000
+#define NETIF_MSG_WOL  0x4000
+
+#ifndef netif_msg_hw
+#define netif_msg_hw(p)                ((p)->msg_enable & NETIF_MSG_HW)
+#endif
+#ifndef netif_msg_wol
+#define netif_msg_wol(p)       ((p)->msg_enable & NETIF_MSG_WOL)
+#endif
+#endif /* 2.4.18 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19) ) || \
+    (( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ) && !defined(CONFIG_CRC32))
+#undef ether_crc_le
+#define ether_crc_le(length, data) _kc_ether_crc_le(length, data)
+static inline unsigned _kc_ether_crc_le(int length, unsigned char *data)
+{
+       unsigned int crc = 0xffffffff;  /* Initial value. */
+       while (--length >= 0) {
+               unsigned char current_octet = *data++;
+               int bit;
+               for (bit = 8; --bit >= 0; current_octet >>= 1) {
+                       if ((crc ^ current_octet) & 1) {
+                               crc >>= 1;
+                               crc ^= 0xedb88320U;
+                       } else
+                               crc >>= 1;
+               }
+       }
+       return crc;
+}
+#else /* < 2.4.19 || (>=2.6.0 && !defined(CONFIG_CRC32)) */
+#include <linux/crc32.h>
+#endif /* < 2.4.19 || (>=2.6.0 && !defined(CONFIG_CRC32)) */
+
+/*****************************************************************************/
+/* 2.4.20 => 2.4.19 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20) )
+
+/* we won't support NAPI on less than 2.4.20 */
+#ifdef NAPI
+#undef NAPI
+#undef CONFIG_E1000E_NAPI
+#endif
+
+#endif /* 2.4.20 => 2.4.19 */
+
+/*****************************************************************************/
+/* 2.4.22 => 2.4.17 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22) )
+#define pci_name(x)    ((x)->slot_name)
+#endif
+
+/*****************************************************************************/
+/*****************************************************************************/
+/* 2.4.23 => 2.4.22 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) )
+/*****************************************************************************/
+#ifdef NAPI
+#ifndef netif_poll_disable
+#define netif_poll_disable(x) _kc_netif_poll_disable(x)
+static inline void _kc_netif_poll_disable(struct net_device *netdev)
+{
+       while (test_and_set_bit(__LINK_STATE_RX_SCHED, &netdev->state)) {
+               /* No hurry */
+               current->state = TASK_INTERRUPTIBLE;
+               schedule_timeout(1);
+       }
+}
+#endif
+#ifndef netif_poll_enable
+#define netif_poll_enable(x) _kc_netif_poll_enable(x)
+static inline void _kc_netif_poll_enable(struct net_device *netdev)
+{
+       clear_bit(__LINK_STATE_RX_SCHED, &netdev->state);
+}
+#endif
+#endif /* NAPI */
+#ifndef netif_tx_disable
+#define netif_tx_disable(x) _kc_netif_tx_disable(x)
+static inline void _kc_netif_tx_disable(struct net_device *dev)
+{
+       spin_lock_bh(&dev->xmit_lock);
+       netif_stop_queue(dev);
+       spin_unlock_bh(&dev->xmit_lock);
+}
+#endif
+#else /* 2.4.23 => 2.4.22 */
+#define HAVE_SCTP
+#endif /* 2.4.23 => 2.4.22 */
+
+/*****************************************************************************/
+/* 2.6.4 => 2.6.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,25) || \
+    ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) && \
+      LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) ) )
+#define ETHTOOL_OPS_COMPAT
+#endif /* 2.6.4 => 2.6.0 */
+
+/*****************************************************************************/
+/* 2.5.71 => 2.4.x */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71) )
+#define sk_protocol protocol
+#define pci_get_device pci_find_device
+#endif /* 2.5.70 => 2.4.x */
+
+/*****************************************************************************/
+/* < 2.4.27 or 2.6.0 <= 2.6.5 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27) || \
+    ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) && \
+      LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) ) )
+
+#ifndef netif_msg_init
+#define netif_msg_init _kc_netif_msg_init
+static inline u32 _kc_netif_msg_init(int debug_value,
+                                    int default_msg_enable_bits)
+{
+       /* use default */
+       if (debug_value < 0 || debug_value >= (sizeof(u32) * 8))
+               return default_msg_enable_bits;
+       if (debug_value == 0)   /* no output */
+               return 0;
+       /* set low N bits */
+       return (1 << debug_value) - 1;
+}
+#endif
+
+#endif /* < 2.4.27 or 2.6.0 <= 2.6.5 */
+/*****************************************************************************/
+#if (( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27) ) || \
+     (( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ) && \
+      ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3) )))
+#define netdev_priv(x) x->priv
+#endif
+
+/*****************************************************************************/
+/* <= 2.5.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) )
+#include <linux/rtnetlink.h>
+#undef pci_register_driver
+#define pci_register_driver pci_module_init
+
+/*
+ * Most of the dma compat code is copied/modifed from the 2.4.37
+ * /include/linux/libata-compat.h header file
+ */
+/* These definitions mirror those in pci.h, so they can be used
+ * interchangeably with their PCI_ counterparts */
+enum dma_data_direction {
+       DMA_BIDIRECTIONAL = 0,
+       DMA_TO_DEVICE = 1,
+       DMA_FROM_DEVICE = 2,
+       DMA_NONE = 3,
+};
+
+struct device {
+       struct pci_dev pdev;
+};
+
+static inline struct pci_dev *to_pci_dev(struct device *dev)
+{
+       return (struct pci_dev *)dev;
+}
+
+static inline struct device *pci_dev_to_dev(struct pci_dev *pdev)
+{
+       return (struct device *)pdev;
+}
+
+#define pdev_printk(lvl, pdev, fmt, args...)   \
+       printk("%s %s: " fmt, lvl, pci_name(pdev), ## args)
+#define dev_err(dev, fmt, args...)            \
+       pdev_printk(KERN_ERR, to_pci_dev(dev), fmt, ## args)
+#define dev_info(dev, fmt, args...)            \
+       pdev_printk(KERN_INFO, to_pci_dev(dev), fmt, ## args)
+#define dev_warn(dev, fmt, args...)            \
+       pdev_printk(KERN_WARNING, to_pci_dev(dev), fmt, ## args)
+
+/* NOTE: dangerous! we ignore the 'gfp' argument */
+#define dma_alloc_coherent(dev,sz,dma,gfp) \
+       pci_alloc_consistent(to_pci_dev(dev),(sz),(dma))
+#define dma_free_coherent(dev,sz,addr,dma_addr) \
+       pci_free_consistent(to_pci_dev(dev),(sz),(addr),(dma_addr))
+
+#define dma_map_page(dev,a,b,c,d) \
+       pci_map_page(to_pci_dev(dev),(a),(b),(c),(d))
+#define dma_unmap_page(dev,a,b,c) \
+       pci_unmap_page(to_pci_dev(dev),(a),(b),(c))
+
+#define dma_map_single(dev,a,b,c) \
+       pci_map_single(to_pci_dev(dev),(a),(b),(c))
+#define dma_unmap_single(dev,a,b,c) \
+       pci_unmap_single(to_pci_dev(dev),(a),(b),(c))
+
+#define dma_sync_single(dev,a,b,c) \
+       pci_dma_sync_single(to_pci_dev(dev),(a),(b),(c))
+
+/* for range just sync everything, that's all the pci API can do */
+#define dma_sync_single_range(dev,addr,off,sz,dir) \
+       pci_dma_sync_single(to_pci_dev(dev),(addr),(off)+(sz),(dir))
+
+#define dma_set_mask(dev,mask) \
+       pci_set_dma_mask(to_pci_dev(dev),(mask))
+
+/* hlist_* code - double linked lists */
+struct hlist_head {
+       struct hlist_node *first;
+};
+
+struct hlist_node {
+       struct hlist_node *next, **pprev;
+};
+
+static inline void __hlist_del(struct hlist_node *n)
+{
+       struct hlist_node *next = n->next;
+       struct hlist_node **pprev = n->pprev;
+       *pprev = next;
+       if (next)
+               next->pprev = pprev;
+}
+
+static inline void hlist_del(struct hlist_node *n)
+{
+       __hlist_del(n);
+       n->next = NULL;
+       n->pprev = NULL;
+}
+
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+{
+       struct hlist_node *first = h->first;
+       n->next = first;
+       if (first)
+               first->pprev = &n->next;
+       h->first = n;
+       n->pprev = &h->first;
+}
+
+static inline int hlist_empty(const struct hlist_head *h)
+{
+       return !h->first;
+}
+
+#define HLIST_HEAD_INIT { .first = NULL }
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
+{
+       h->next = NULL;
+       h->pprev = NULL;
+}
+
+#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+
+#define hlist_for_each_entry(tpos, pos, head, member)                    \
+       for (pos = (head)->first;                                        \
+            pos && ({ prefetch(pos->next); 1;}) &&                      \
+               ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+            pos = pos->next)
+
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member)            \
+       for (pos = (head)->first;                                        \
+            pos && ({ n = pos->next; 1; }) &&                           \
+               ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+            pos = n)
+
+#ifndef might_sleep
+#define might_sleep()
+#endif
+#else
+static inline struct device *pci_dev_to_dev(struct pci_dev *pdev)
+{
+       return &pdev->dev;
+}
+#endif /* <= 2.5.0 */
+
+/*****************************************************************************/
+/* 2.5.28 => 2.4.23 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28) )
+
+static inline void _kc_synchronize_irq(void)
+{
+       synchronize_irq();
+}
+
+#undef synchronize_irq
+#define synchronize_irq(X) _kc_synchronize_irq()
+
+#include <linux/tqueue.h>
+#define work_struct tq_struct
+#undef INIT_WORK
+#define INIT_WORK(a,b) INIT_TQUEUE(a,(void (*)(void *))b,a)
+#undef container_of
+#define container_of list_entry
+#define schedule_work schedule_task
+#define flush_scheduled_work flush_scheduled_tasks
+#define cancel_work_sync(x) flush_scheduled_work()
+
+#endif /* 2.5.28 => 2.4.17 */
+
+/*****************************************************************************/
+/* 2.6.0 => 2.5.28 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
+#undef get_cpu
+#define get_cpu() smp_processor_id()
+#undef put_cpu
+#define put_cpu() do { } while(0)
+#define MODULE_INFO(version, _version)
+#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
+#define CONFIG_E1000_DISABLE_PACKET_SPLIT 1
+#endif
+#ifndef CONFIG_IGB_DISABLE_PACKET_SPLIT
+#define CONFIG_IGB_DISABLE_PACKET_SPLIT 1
+#endif
+
+#define dma_set_coherent_mask(dev,mask) 1
+
+#undef dev_put
+#define dev_put(dev) __dev_put(dev)
+
+#ifndef skb_fill_page_desc
+#define skb_fill_page_desc _kc_skb_fill_page_desc
+extern void _kc_skb_fill_page_desc(struct sk_buff *skb, int i,
+                                  struct page *page, int off, int size);
+#endif
+
+#undef ALIGN
+#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
+
+#ifndef page_count
+#define page_count(p) atomic_read(&(p)->count)
+#endif
+
+#ifdef MAX_NUMNODES
+#undef MAX_NUMNODES
+#endif
+#define MAX_NUMNODES 1
+
+/* find_first_bit and find_next bit are not defined for most
+ * 2.4 kernels (except for the redhat 2.4.21 kernels
+ */
+#include <linux/bitops.h>
+#define BITOP_WORD(nr)          ((nr) / BITS_PER_LONG)
+#undef find_next_bit
+#define find_next_bit _kc_find_next_bit
+extern unsigned long _kc_find_next_bit(const unsigned long *addr,
+                                      unsigned long size,
+                                      unsigned long offset);
+#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
+
+#ifndef netdev_name
+static inline const char *_kc_netdev_name(const struct net_device *dev)
+{
+       if (strchr(dev->name, '%'))
+               return "(unregistered net_device)";
+       return dev->name;
+}
+
+#define netdev_name(netdev)    _kc_netdev_name(netdev)
+#endif /* netdev_name */
+
+#ifndef strlcpy
+#define strlcpy _kc_strlcpy
+extern size_t _kc_strlcpy(char *dest, const char *src, size_t size);
+#endif /* strlcpy */
+
+#endif /* 2.6.0 => 2.5.28 */
+
+/*****************************************************************************/
+/* 2.6.4 => 2.6.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) )
+#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
+#endif /* 2.6.4 => 2.6.0 */
+
+/*****************************************************************************/
+/* 2.6.5 => 2.6.0 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
+#define dma_sync_single_for_cpu                dma_sync_single
+#define dma_sync_single_for_device     dma_sync_single
+#define dma_sync_single_range_for_cpu          dma_sync_single_range
+#define dma_sync_single_range_for_device       dma_sync_single_range
+#ifndef pci_dma_mapping_error
+#define pci_dma_mapping_error _kc_pci_dma_mapping_error
+static inline int _kc_pci_dma_mapping_error(dma_addr_t dma_addr)
+{
+       return dma_addr == 0;
+}
+#endif
+#endif /* 2.6.5 => 2.6.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) )
+extern int _kc_scnprintf(char *buf, size_t size, const char *fmt, ...);
+#define scnprintf(buf, size, fmt, args...) _kc_scnprintf(buf, size, fmt, ##args)
+#endif /* < 2.6.4 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6) )
+/* taken from 2.6 include/linux/bitmap.h */
+#undef bitmap_zero
+#define bitmap_zero _kc_bitmap_zero
+static inline void _kc_bitmap_zero(unsigned long *dst, int nbits)
+{
+       if (nbits <= BITS_PER_LONG)
+               *dst = 0UL;
+       else {
+               int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
+               memset(dst, 0, len);
+       }
+}
+
+#define random_ether_addr _kc_random_ether_addr
+static inline void _kc_random_ether_addr(u8 *addr)
+{
+       get_random_bytes(addr, ETH_ALEN);
+       addr[0] &= 0xfe;        /* clear multicast */
+       addr[0] |= 0x02;        /* set local assignment */
+}
+
+#define page_to_nid(x) 0
+
+#endif /* < 2.6.6 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7) )
+#undef if_mii
+#define if_mii _kc_if_mii
+static inline struct mii_ioctl_data *_kc_if_mii(struct ifreq *rq)
+{
+       return (struct mii_ioctl_data *)&rq->ifr_ifru;
+}
+
+#ifndef __force
+#define __force
+#endif
+#endif /* < 2.6.7 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) )
+#ifndef PCI_EXP_DEVCTL
+#define PCI_EXP_DEVCTL 8
+#endif
+#ifndef PCI_EXP_DEVCTL_CERE
+#define PCI_EXP_DEVCTL_CERE 0x0001
+#endif
+#define msleep(x)      do { set_current_state(TASK_UNINTERRUPTIBLE); \
+                               schedule_timeout((x * HZ)/1000 + 2); \
+                       } while (0)
+
+#endif /* < 2.6.8 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+#include <net/dsfield.h>
+#define __iomem
+
+#ifndef kcalloc
+#define kcalloc(n, size, flags) _kc_kzalloc(((n) * (size)), flags)
+extern void *_kc_kzalloc(size_t size, int flags);
+#endif
+#define MSEC_PER_SEC    1000L
+static inline unsigned int _kc_jiffies_to_msecs(const unsigned long j)
+{
+#if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
+       return (MSEC_PER_SEC / HZ) * j;
+#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
+       return (j + (HZ / MSEC_PER_SEC) - 1) / (HZ / MSEC_PER_SEC);
+#else
+       return (j * MSEC_PER_SEC) / HZ;
+#endif
+}
+
+static inline unsigned long _kc_msecs_to_jiffies(const unsigned int m)
+{
+       if (m > _kc_jiffies_to_msecs(MAX_JIFFY_OFFSET))
+               return MAX_JIFFY_OFFSET;
+#if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
+       return (m + (MSEC_PER_SEC / HZ) - 1) / (MSEC_PER_SEC / HZ);
+#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC)
+       return m * (HZ / MSEC_PER_SEC);
+#else
+       return (m * HZ + MSEC_PER_SEC - 1) / MSEC_PER_SEC;
+#endif
+}
+
+#define msleep_interruptible _kc_msleep_interruptible
+static inline unsigned long _kc_msleep_interruptible(unsigned int msecs)
+{
+       unsigned long timeout = _kc_msecs_to_jiffies(msecs) + 1;
+
+       while (timeout && !signal_pending(current)) {
+               __set_current_state(TASK_INTERRUPTIBLE);
+               timeout = schedule_timeout(timeout);
+       }
+       return _kc_jiffies_to_msecs(timeout);
+}
+
+/* Basic mode control register. */
+#define BMCR_SPEED1000         0x0040  /* MSB of Speed (1000)         */
+
+#ifndef __le16
+#define __le16 u16
+#endif
+#ifndef __le32
+#define __le32 u32
+#endif
+#ifndef __le64
+#define __le64 u64
+#endif
+#ifndef __be16
+#define __be16 u16
+#endif
+#ifndef __be32
+#define __be32 u32
+#endif
+#ifndef __be64
+#define __be64 u64
+#endif
+
+static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
+{
+       return (struct vlan_ethhdr *)skb->mac.raw;
+}
+
+/* Wake-On-Lan options. */
+#define WAKE_PHY               (1 << 0)
+#define WAKE_UCAST             (1 << 1)
+#define WAKE_MCAST             (1 << 2)
+#define WAKE_BCAST             (1 << 3)
+#define WAKE_ARP               (1 << 4)
+#define WAKE_MAGIC             (1 << 5)
+#define WAKE_MAGICSECURE       (1 << 6)        /* only meaningful if WAKE_MAGIC */
+
+#define skb_header_pointer _kc_skb_header_pointer
+static inline void *_kc_skb_header_pointer(const struct sk_buff *skb,
+                                          int offset, int len, void *buffer)
+{
+       int hlen = skb_headlen(skb);
+
+       if (hlen - offset >= len)
+               return skb->data + offset;
+
+#ifdef MAX_SKB_FRAGS
+       if (skb_copy_bits(skb, offset, buffer, len) < 0)
+               return NULL;
+
+       return buffer;
+#else
+       return NULL;
+#endif
+
+#ifndef NETDEV_TX_OK
+#define NETDEV_TX_OK 0
+#endif
+#ifndef NETDEV_TX_BUSY
+#define NETDEV_TX_BUSY 1
+#endif
+#ifndef NETDEV_TX_LOCKED
+#define NETDEV_TX_LOCKED -1
+#endif
+}
+
+#ifndef __bitwise
+#define __bitwise
+#endif
+#endif /* < 2.6.9 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) )
+#ifdef module_param_array_named
+#undef module_param_array_named
+#define module_param_array_named(name, array, type, nump, perm)          \
+       static struct kparam_array __param_arr_##name                    \
+       = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type, \
+           sizeof(array[0]), array };                                   \
+       module_param_call(name, param_array_set, param_array_get,        \
+                         &__param_arr_##name, perm)
+#endif /* module_param_array_named */
+/*
+ * num_online is broken for all < 2.6.10 kernels.  This is needed to support
+ * Node module parameter of ixgbe.
+ */
+#undef num_online_nodes
+#define num_online_nodes(n) 1
+extern DECLARE_BITMAP(_kcompat_node_online_map, MAX_NUMNODES);
+#undef node_online_map
+#define node_online_map _kcompat_node_online_map
+#endif /* < 2.6.10 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
+#define PCI_D0      0
+#define PCI_D1      1
+#define PCI_D2      2
+#define PCI_D3hot   3
+#define PCI_D3cold  4
+typedef int pci_power_t;
+#define pci_choose_state(pdev,state) state
+#define PMSG_SUSPEND 3
+#define PCI_EXP_LNKCTL 16
+
+#undef NETIF_F_LLTX
+
+#ifndef ARCH_HAS_PREFETCH
+#define prefetch(X)
+#endif
+
+#ifndef NET_IP_ALIGN
+#define NET_IP_ALIGN 2
+#endif
+
+#define KC_USEC_PER_SEC        1000000L
+#define usecs_to_jiffies _kc_usecs_to_jiffies
+static inline unsigned int _kc_jiffies_to_usecs(const unsigned long j)
+{
+#if HZ <= KC_USEC_PER_SEC && !(KC_USEC_PER_SEC % HZ)
+       return (KC_USEC_PER_SEC / HZ) * j;
+#elif HZ > KC_USEC_PER_SEC && !(HZ % KC_USEC_PER_SEC)
+       return (j + (HZ / KC_USEC_PER_SEC) - 1) / (HZ / KC_USEC_PER_SEC);
+#else
+       return (j * KC_USEC_PER_SEC) / HZ;
+#endif
+}
+
+static inline unsigned long _kc_usecs_to_jiffies(const unsigned int m)
+{
+       if (m > _kc_jiffies_to_usecs(MAX_JIFFY_OFFSET))
+               return MAX_JIFFY_OFFSET;
+#if HZ <= KC_USEC_PER_SEC && !(KC_USEC_PER_SEC % HZ)
+       return (m + (KC_USEC_PER_SEC / HZ) - 1) / (KC_USEC_PER_SEC / HZ);
+#elif HZ > KC_USEC_PER_SEC && !(HZ % KC_USEC_PER_SEC)
+       return m * (HZ / KC_USEC_PER_SEC);
+#else
+       return (m * HZ + KC_USEC_PER_SEC - 1) / KC_USEC_PER_SEC;
+#endif
+}
+#endif /* < 2.6.11 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) )
+#include <linux/reboot.h>
+#define USE_REBOOT_NOTIFIER
+
+/* Generic MII registers. */
+#define MII_CTRL1000        0x09       /* 1000BASE-T control          */
+#define MII_STAT1000        0x0a       /* 1000BASE-T status           */
+/* Advertisement control register. */
+#define ADVERTISE_PAUSE_CAP     0x0400 /* Try for pause               */
+#define ADVERTISE_PAUSE_ASYM    0x0800 /* Try for asymmetric pause     */
+/* 1000BASE-T Control register */
+#define ADVERTISE_1000FULL      0x0200 /* Advertise 1000BASE-T full duplex */
+#ifndef is_zero_ether_addr
+#define is_zero_ether_addr _kc_is_zero_ether_addr
+static inline int _kc_is_zero_ether_addr(const u8 *addr)
+{
+       return !(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]);
+}
+#endif /* is_zero_ether_addr */
+#ifndef is_multicast_ether_addr
+#define is_multicast_ether_addr _kc_is_multicast_ether_addr
+static inline int _kc_is_multicast_ether_addr(const u8 *addr)
+{
+       return addr[0] & 0x01;
+}
+#endif /* is_multicast_ether_addr */
+#endif /* < 2.6.12 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) )
+#ifndef kstrdup
+#define kstrdup _kc_kstrdup
+extern char *_kc_kstrdup(const char *s, unsigned int gfp);
+#endif
+#endif /* < 2.6.13 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) )
+#define pm_message_t u32
+#ifndef kzalloc
+#define kzalloc _kc_kzalloc
+extern void *_kc_kzalloc(size_t size, int flags);
+#endif
+
+/* Generic MII registers. */
+#define MII_ESTATUS        0x0f        /* Extended Status */
+/* Basic mode status register. */
+#define BMSR_ESTATEN           0x0100  /* Extended Status in R15 */
+/* Extended status register. */
+#define ESTATUS_1000_TFULL     0x2000  /* Can do 1000BT Full */
+#define ESTATUS_1000_THALF     0x1000  /* Can do 1000BT Half */
+
+#define ADVERTISED_Pause       (1 << 13)
+#define ADVERTISED_Asym_Pause  (1 << 14)
+
+#if (!(RHEL_RELEASE_CODE && \
+       (RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,3)) && \
+       (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0))))
+#if ((LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)) && !defined(gfp_t))
+#define gfp_t unsigned
+#else
+typedef unsigned gfp_t;
+#endif
+#endif /* !RHEL4.3->RHEL5.0 */
+
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9) )
+#ifdef CONFIG_X86_64
+#define dma_sync_single_range_for_cpu(dev, dma_handle, offset, size, dir)       \
+       dma_sync_single_for_cpu(dev, dma_handle, size, dir)
+#define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir)    \
+       dma_sync_single_for_device(dev, dma_handle, size, dir)
+#endif
+#endif
+#endif /* < 2.6.14 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) )
+#ifndef vmalloc_node
+#define vmalloc_node(a,b) vmalloc(a)
+#endif /* vmalloc_node */
+
+#define setup_timer(_timer, _function, _data) \
+do { \
+       (_timer)->function = _function; \
+       (_timer)->data = _data; \
+       init_timer(_timer); \
+} while (0)
+#ifndef device_can_wakeup
+#define device_can_wakeup(dev) (1)
+#endif
+#ifndef device_set_wakeup_enable
+#define device_set_wakeup_enable(dev, val)     do{}while(0)
+#endif
+#ifndef device_init_wakeup
+#define device_init_wakeup(dev,val) do {} while (0)
+#endif
+static inline unsigned _kc_compare_ether_addr(const u8 *addr1, const u8 *addr2)
+{
+       const u16 *a = (const u16 *)addr1;
+       const u16 *b = (const u16 *)addr2;
+
+       return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;
+}
+
+#undef compare_ether_addr
+#define compare_ether_addr(addr1, addr2) _kc_compare_ether_addr(addr1, addr2)
+#endif /* < 2.6.15 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) )
+#undef DEFINE_MUTEX
+#define DEFINE_MUTEX(x)        DECLARE_MUTEX(x)
+#define mutex_lock(x)  down_interruptible(x)
+#define mutex_unlock(x)        up(x)
+
+#ifndef ____cacheline_internodealigned_in_smp
+#ifdef CONFIG_SMP
+#define ____cacheline_internodealigned_in_smp ____cacheline_aligned_in_smp
+#else
+#define ____cacheline_internodealigned_in_smp
+#endif /* CONFIG_SMP */
+#endif /* ____cacheline_internodealigned_in_smp */
+#undef HAVE_PCI_ERS
+#else /* 2.6.16 and above */
+#undef HAVE_PCI_ERS
+#define HAVE_PCI_ERS
+#endif /* < 2.6.16 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) )
+#ifndef first_online_node
+#define first_online_node 0
+#endif
+#ifndef NET_SKB_PAD
+#define NET_SKB_PAD 16
+#endif
+#endif /* < 2.6.17 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) )
+
+#ifndef IRQ_HANDLED
+#define irqreturn_t void
+#define IRQ_HANDLED
+#define IRQ_NONE
+#endif
+
+#ifndef IRQF_PROBE_SHARED
+#ifdef SA_PROBEIRQ
+#define IRQF_PROBE_SHARED SA_PROBEIRQ
+#else
+#define IRQF_PROBE_SHARED 0
+#endif
+#endif
+
+#ifndef IRQF_SHARED
+#define IRQF_SHARED SA_SHIRQ
+#endif
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
+#ifndef FIELD_SIZEOF
+#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+#endif
+
+#ifndef skb_is_gso
+#ifdef NETIF_F_TSO
+#define skb_is_gso _kc_skb_is_gso
+static inline int _kc_skb_is_gso(const struct sk_buff *skb)
+{
+       return skb_shinfo(skb)->gso_size;
+}
+#else
+#define skb_is_gso(a) 0
+#endif
+#endif
+
+#ifndef resource_size_t
+#define resource_size_t unsigned long
+#endif
+
+#ifdef skb_pad
+#undef skb_pad
+#endif
+#define skb_pad(x,y) _kc_skb_pad(x, y)
+int _kc_skb_pad(struct sk_buff *skb, int pad);
+#ifdef skb_padto
+#undef skb_padto
+#endif
+#define skb_padto(x,y) _kc_skb_padto(x, y)
+static inline int _kc_skb_padto(struct sk_buff *skb, unsigned int len)
+{
+       unsigned int size = skb->len;
+       if (likely(size >= len))
+               return 0;
+       return _kc_skb_pad(skb, len - size);
+}
+
+#ifndef DECLARE_PCI_UNMAP_ADDR
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
+       dma_addr_t ADDR_NAME
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
+       u32 LEN_NAME
+#define pci_unmap_addr(PTR, ADDR_NAME) \
+       ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+       (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME) \
+       ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+       (((PTR)->LEN_NAME) = (VAL))
+#endif /* DECLARE_PCI_UNMAP_ADDR */
+#endif /* < 2.6.18 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) )
+
+#ifndef DIV_ROUND_UP
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+#endif
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) )
+#if (!((RHEL_RELEASE_CODE && \
+        ((RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) && \
+          RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0)) || \
+         (RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0)))) || \
+       (AX_RELEASE_CODE && AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
+typedef irqreturn_t(*irq_handler_t) (int, void *, struct pt_regs *);
+#endif
+#if (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,0))
+#undef CONFIG_INET_LRO
+#undef CONFIG_INET_LRO_MODULE
+#ifdef IXGBE_FCOE
+#undef CONFIG_FCOE
+#undef CONFIG_FCOE_MODULE
+#endif /* IXGBE_FCOE */
+#endif
+typedef irqreturn_t(*new_handler_t) (int, void *);
+static inline irqreturn_t _kc_request_irq(unsigned int irq,
+                                         new_handler_t handler,
+                                         unsigned long flags,
+                                         const char *devname, void *dev_id)
+#else /* 2.4.x */
+typedef void (*irq_handler_t) (int, void *, struct pt_regs *);
+typedef void (*new_handler_t) (int, void *);
+static inline int _kc_request_irq(unsigned int irq, new_handler_t handler,
+                                 unsigned long flags, const char *devname,
+                                 void *dev_id)
+#endif                         /* >= 2.5.x */
+{
+       irq_handler_t new_handler = (irq_handler_t) handler;
+       return request_irq(irq, new_handler, flags, devname, dev_id);
+}
+
+#undef request_irq
+#define request_irq(irq, handler, flags, devname, dev_id) _kc_request_irq((irq), (handler), (flags), (devname), (dev_id))
+
+#define irq_handler_t new_handler_t
+/* pci_restore_state and pci_save_state handles MSI/PCIE from 2.6.19 */
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5,4)))
+#define PCIE_CONFIG_SPACE_LEN 256
+#define PCI_CONFIG_SPACE_LEN 64
+#define PCIE_LINK_STATUS 0x12
+#define pci_config_space_ich8lan() { \
+       if (adapter->flags & FLAG_IS_ICH) \
+               size = PCIE_CONFIG_SPACE_LEN; \
+}
+#undef pci_save_state
+extern int _kc_pci_save_state(struct pci_dev *);
+#define pci_save_state(pdev) _kc_pci_save_state(pdev)
+#undef pci_restore_state
+extern void _kc_pci_restore_state(struct pci_dev *);
+#define pci_restore_state(pdev) _kc_pci_restore_state(pdev)
+#endif /* !(RHEL_RELEASE_CODE >= RHEL 5.4) */
+
+#ifdef HAVE_PCI_ERS
+#undef free_netdev
+extern void _kc_free_netdev(struct net_device *);
+#define free_netdev(netdev) _kc_free_netdev(netdev)
+#endif
+static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
+{
+       return 0;
+}
+
+#define pci_disable_pcie_error_reporting(dev) do {} while (0)
+#define pci_cleanup_aer_uncorrect_error_status(dev) do {} while (0)
+
+extern void *_kc_kmemdup(const void *src, size_t len, unsigned gfp);
+#define kmemdup(src, len, gfp) _kc_kmemdup(src, len, gfp)
+#ifndef bool
+#define bool _Bool
+#define true 1
+#define false 0
+#endif
+#else /* 2.6.19 */
+#include <linux/aer.h>
+#include <linux/string.h>
+#endif /* < 2.6.19 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) )
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,28) )
+#undef INIT_WORK
+#define INIT_WORK(_work, _func) \
+do { \
+       INIT_LIST_HEAD(&(_work)->entry); \
+       (_work)->pending = 0; \
+       (_work)->func = (void (*)(void *))_func; \
+       (_work)->data = _work; \
+       init_timer(&(_work)->timer); \
+} while (0)
+#endif
+
+#ifndef PCI_VDEVICE
+#define PCI_VDEVICE(ven, dev)        \
+       PCI_VENDOR_ID_##ven, (dev),  \
+       PCI_ANY_ID, PCI_ANY_ID, 0, 0
+#endif
+
+#ifndef round_jiffies
+#define round_jiffies(x) x
+#endif
+
+#define csum_offset csum
+
+#define HAVE_EARLY_VMALLOC_NODE
+#define dev_to_node(dev) -1
+#undef set_dev_node
+/* remove compiler warning with b=b, for unused variable */
+#define set_dev_node(a, b) do { (b) = (b); } while(0)
+
+#if (!(RHEL_RELEASE_CODE && \
+       (((RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(4,7)) && \
+         (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0))) || \
+        (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5,6)))) && \
+     !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(10,2,0)))
+typedef __u16 __bitwise __sum16;
+typedef __u32 __bitwise __wsum;
+#endif
+
+#if (!(RHEL_RELEASE_CODE && \
+       (((RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(4,7)) && \
+         (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0))) || \
+        (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5,4)))) && \
+     !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(10,2,0)))
+static inline __wsum csum_unfold(__sum16 n)
+{
+       return (__force __wsum) n;
+}
+#endif
+
+#else /* < 2.6.20 */
+#define HAVE_DEVICE_NUMA_NODE
+#endif /* < 2.6.20 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) )
+#define to_net_dev(class) container_of(class, struct net_device, class_dev)
+#define NETDEV_CLASS_DEV
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,5)))
+#define vlan_group_get_device(vg, id) (vg->vlan_devices[id])
+#define vlan_group_set_device(vg, id, dev)             \
+       do {                                            \
+               if (vg) vg->vlan_devices[id] = dev;     \
+       } while (0)
+#endif /* !(RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,5)) */
+#define pci_channel_offline(pdev) (pdev->error_state && \
+       pdev->error_state != pci_channel_io_normal)
+#define pci_request_selected_regions(pdev, bars, name) \
+        pci_request_regions(pdev, name)
+#define pci_release_selected_regions(pdev, bars) pci_release_regions(pdev);
+#endif /* < 2.6.21 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) )
+#define tcp_hdr(skb) (skb->h.th)
+#define tcp_hdrlen(skb) (skb->h.th->doff << 2)
+#define skb_transport_offset(skb) (skb->h.raw - skb->data)
+#define skb_transport_header(skb) (skb->h.raw)
+#define ipv6_hdr(skb) (skb->nh.ipv6h)
+#define ip_hdr(skb) (skb->nh.iph)
+#define skb_network_offset(skb) (skb->nh.raw - skb->data)
+#define skb_network_header(skb) (skb->nh.raw)
+#define skb_tail_pointer(skb) skb->tail
+#define skb_reset_tail_pointer(skb) \
+       do { \
+               skb->tail = skb->data; \
+       } while (0)
+#define skb_copy_to_linear_data(skb, from, len) \
+                               memcpy(skb->data, from, len)
+#define skb_copy_to_linear_data_offset(skb, offset, from, len) \
+                               memcpy(skb->data + offset, from, len)
+#define skb_network_header_len(skb) (skb->h.raw - skb->nh.raw)
+#define pci_register_driver pci_module_init
+#define skb_mac_header(skb) skb->mac.raw
+
+#ifdef NETIF_F_MULTI_QUEUE
+#ifndef alloc_etherdev_mq
+#define alloc_etherdev_mq(_a, _b) alloc_etherdev(_a)
+#endif
+#endif /* NETIF_F_MULTI_QUEUE */
+
+#ifndef ETH_FCS_LEN
+#define ETH_FCS_LEN 4
+#endif
+#define cancel_work_sync(x) flush_scheduled_work()
+#ifndef udp_hdr
+#define udp_hdr _udp_hdr
+static inline struct udphdr *_udp_hdr(const struct sk_buff *skb)
+{
+       return (struct udphdr *)skb_transport_header(skb);
+}
+#endif
+
+#ifdef cpu_to_be16
+#undef cpu_to_be16
+#endif
+#define cpu_to_be16(x) __constant_htons(x)
+
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,1)))
+enum {
+       DUMP_PREFIX_NONE,
+       DUMP_PREFIX_ADDRESS,
+       DUMP_PREFIX_OFFSET
+};
+#endif /* !(RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,1)) */
+#ifndef hex_asc
+#define hex_asc(x)     "0123456789abcdef"[x]
+#endif
+#include <linux/ctype.h>
+extern void _kc_print_hex_dump(const char *level, const char *prefix_str,
+                              int prefix_type, int rowsize, int groupsize,
+                              const void *buf, size_t len, bool ascii);
+#define print_hex_dump(lvl, s, t, r, g, b, l, a) \
+               _kc_print_hex_dump(lvl, s, t, r, g, b, l, a)
+#else /* 2.6.22 */
+#define ETH_TYPE_TRANS_SETS_DEV
+#define HAVE_NETDEV_STATS_IN_NETDEV
+#endif /* < 2.6.22 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22) )
+#undef SET_MODULE_OWNER
+#define SET_MODULE_OWNER(dev) do { } while (0)
+#endif /* > 2.6.22 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) )
+#define netif_subqueue_stopped(_a, _b) 0
+#ifndef PTR_ALIGN
+#define PTR_ALIGN(p, a)         ((typeof(p))ALIGN((unsigned long)(p), (a)))
+#endif
+
+#ifndef CONFIG_PM_SLEEP
+#define CONFIG_PM_SLEEP        CONFIG_PM
+#endif
+
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) )
+#define HAVE_ETHTOOL_GET_PERM_ADDR
+#endif /* 2.6.14 through 2.6.22 */
+#endif /* < 2.6.23 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) )
+#ifndef ETH_FLAG_LRO
+#define ETH_FLAG_LRO NETIF_F_LRO
+#endif
+
+/* if GRO is supported then the napi struct must already exist */
+#ifndef NETIF_F_GRO
+/* NAPI API changes in 2.6.24 break everything */
+struct napi_struct {
+       /* used to look up the real NAPI polling routine */
+       int (*poll) (struct napi_struct *, int);
+       struct net_device *dev;
+       int weight;
+};
+#endif
+
+#ifdef NAPI
+extern int __kc_adapter_clean(struct net_device *, int *);
+#define napi_to_poll_dev(_napi) (_napi)->dev
+#define netif_napi_add(_netdev, _napi, _poll, _weight) \
+       do { \
+               struct napi_struct *__napi = (_napi); \
+               _netdev->poll = &(__kc_adapter_clean); \
+               _netdev->weight = (_weight); \
+               __napi->poll = &(_poll); \
+               __napi->weight = (_weight); \
+               __napi->dev = (_netdev); \
+               netif_poll_disable(_netdev); \
+       } while (0)
+#define netif_napi_del(_a) do {} while (0)
+#define napi_schedule_prep(_napi) netif_rx_schedule_prep((_napi)->dev)
+#define napi_schedule(_napi) netif_rx_schedule((_napi)->dev)
+#define napi_enable(_napi) netif_poll_enable(napi_to_poll_dev(_napi))
+#define napi_disable(_napi) netif_poll_disable(napi_to_poll_dev(_napi))
+#define __napi_schedule(_napi) __netif_rx_schedule(napi_to_poll_dev(_napi))
+#ifndef NETIF_F_GRO
+#define napi_complete(_napi) netif_rx_complete(napi_to_poll_dev(_napi))
+#else
+#define napi_complete(_napi) \
+       do { \
+               napi_gro_flush(_napi); \
+               netif_rx_complete(napi_to_poll_dev(_napi)); \
+       } while (0)
+#endif /* NETIF_F_GRO */
+#else /* NAPI */
+#define netif_napi_add(_netdev, _napi, _poll, _weight) \
+       do { \
+               struct napi_struct *__napi = _napi; \
+               _netdev->poll = &(_poll); \
+               _netdev->weight = (_weight); \
+               __napi->poll = &(_poll); \
+               __napi->weight = (_weight); \
+               __napi->dev = (_netdev); \
+       } while (0)
+#define netif_napi_del(_a) do {} while (0)
+#endif /* NAPI */
+
+#undef dev_get_by_name
+#define dev_get_by_name(_a, _b) dev_get_by_name(_b)
+#define __netif_subqueue_stopped(_a, _b) netif_subqueue_stopped(_a, _b)
+#ifndef DMA_BIT_MASK
+#define DMA_BIT_MASK(n)        (((n) == 64) ? DMA_64BIT_MASK : ((1ULL<<(n))-1))
+#endif
+
+#ifdef NETIF_F_TSO6
+#define skb_is_gso_v6 _kc_skb_is_gso_v6
+static inline int _kc_skb_is_gso_v6(const struct sk_buff *skb)
+{
+       return skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6;
+}
+#endif /* NETIF_F_TSO6 */
+
+#ifndef KERN_CONT
+#define KERN_CONT      ""
+#endif
+#else /* < 2.6.24 */
+#define HAVE_ETHTOOL_GET_SSET_COUNT
+#define HAVE_NETDEV_NAPI_LIST
+#endif /* < 2.6.24 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) )
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) )
+#include <linux/pm_qos_params.h>
+#else /* >= 3.2.0 */
+#include <linux/pm_qos.h>
+#endif /* else >= 3.2.0 */
+#endif /* > 2.6.24 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) )
+#define PM_QOS_CPU_DMA_LATENCY 1
+
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18) )
+#include <linux/latency.h>
+#define PM_QOS_DEFAULT_VALUE   INFINITE_LATENCY
+#define pm_qos_add_requirement(pm_qos_class, name, value) \
+               set_acceptable_latency(name, value)
+#define pm_qos_remove_requirement(pm_qos_class, name) \
+               remove_acceptable_latency(name)
+#define pm_qos_update_requirement(pm_qos_class, name, value) \
+               modify_acceptable_latency(name, value)
+#else
+#define PM_QOS_DEFAULT_VALUE   -1
+#define pm_qos_add_requirement(pm_qos_class, name, value)
+#define pm_qos_remove_requirement(pm_qos_class, name)
+#define pm_qos_update_requirement(pm_qos_class, name, value) { \
+       if (value != PM_QOS_DEFAULT_VALUE) { \
+               printk(KERN_WARNING "%s: unable to set PM QoS requirement\n", \
+                       pci_name(adapter->pdev)); \
+       } \
+}
+
+#endif /* > 2.6.18 */
+
+#define pci_enable_device_mem(pdev) pci_enable_device(pdev)
+
+#ifndef DEFINE_PCI_DEVICE_TABLE
+#define DEFINE_PCI_DEVICE_TABLE(_table) struct pci_device_id _table[]
+#endif /* DEFINE_PCI_DEVICE_TABLE */
+
+#else /* < 2.6.25 */
+
+#endif /* < 2.6.25 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) )
+#ifndef clamp_t
+#define clamp_t(type, val, min, max) ({                \
+       type __val = (val);                     \
+       type __min = (min);                     \
+       type __max = (max);                     \
+       __val = __val < __min ? __min : __val;  \
+       __val > __max ? __max : __val; })
+#endif /* clamp_t */
+#undef kzalloc_node
+#define kzalloc_node(_size, _flags, _node) kzalloc(_size, _flags)
+
+extern void _kc_pci_disable_link_state(struct pci_dev *dev, int state);
+#define pci_disable_link_state(p, s) _kc_pci_disable_link_state(p, s)
+#else /* < 2.6.26 */
+#include <linux/pci-aspm.h>
+#define HAVE_NETDEV_VLAN_FEATURES
+#endif /* < 2.6.26 */
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) )
+static inline void _kc_ethtool_cmd_speed_set(struct ethtool_cmd *ep,
+                                            __u32 speed)
+{
+       ep->speed = (__u16) speed;
+       /* ep->speed_hi = (__u16)(speed >> 16); */
+}
+
+#define ethtool_cmd_speed_set _kc_ethtool_cmd_speed_set
+
+static inline __u32 _kc_ethtool_cmd_speed(struct ethtool_cmd *ep)
+{
+       /* no speed_hi before 2.6.27, and probably no need for it yet */
+       return (__u32) ep->speed;
+}
+
+#define ethtool_cmd_speed _kc_ethtool_cmd_speed
+
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) )
+#if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) && defined(CONFIG_PM))
+#define ANCIENT_PM 1
+#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)) && \
+       (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) && \
+       defined(CONFIG_PM_SLEEP))
+#define NEWER_PM 1
+#endif
+#if defined(ANCIENT_PM) || defined(NEWER_PM)
+#undef device_set_wakeup_enable
+#define device_set_wakeup_enable(dev, val) \
+       do { \
+               u16 pmc = 0; \
+               int pm = pci_find_capability(adapter->pdev, PCI_CAP_ID_PM); \
+               if (pm) { \
+                       pci_read_config_word(adapter->pdev, pm + PCI_PM_PMC, \
+                               &pmc); \
+               } \
+               (dev)->power.can_wakeup = !!(pmc >> 11); \
+               (dev)->power.should_wakeup = (val && (pmc >> 11)); \
+       } while (0)
+#endif /* 2.6.15-2.6.22 and CONFIG_PM or 2.6.23-2.6.25 and CONFIG_PM_SLEEP */
+#endif /* 2.6.15 through 2.6.27 */
+#ifndef netif_napi_del
+#define netif_napi_del(_a) do {} while (0)
+#ifdef NAPI
+#ifdef CONFIG_NETPOLL
+#undef netif_napi_del
+#define netif_napi_del(_a) list_del(&(_a)->dev_list);
+#endif
+#endif
+#endif /* netif_napi_del */
+#ifdef dma_mapping_error
+#undef dma_mapping_error
+#endif
+#define dma_mapping_error(dev, dma_addr) pci_dma_mapping_error(dma_addr)
+
+#ifdef HAVE_TX_MQ
+extern void _kc_netif_tx_stop_all_queues(struct net_device *);
+extern void _kc_netif_tx_wake_all_queues(struct net_device *);
+extern void _kc_netif_tx_start_all_queues(struct net_device *);
+#define netif_tx_stop_all_queues(a) _kc_netif_tx_stop_all_queues(a)
+#define netif_tx_wake_all_queues(a) _kc_netif_tx_wake_all_queues(a)
+#define netif_tx_start_all_queues(a) _kc_netif_tx_start_all_queues(a)
+#undef netif_stop_subqueue
+#define netif_stop_subqueue(_ndev,_qi) do { \
+       if (netif_is_multiqueue((_ndev))) \
+               netif_stop_subqueue((_ndev), (_qi)); \
+       else \
+               netif_stop_queue((_ndev)); \
+       } while (0)
+#undef netif_start_subqueue
+#define netif_start_subqueue(_ndev,_qi) do { \
+       if (netif_is_multiqueue((_ndev))) \
+               netif_start_subqueue((_ndev), (_qi)); \
+       else \
+               netif_start_queue((_ndev)); \
+       } while (0)
+#else /* HAVE_TX_MQ */
+#define netif_tx_stop_all_queues(a) netif_stop_queue(a)
+#define netif_tx_wake_all_queues(a) netif_wake_queue(a)
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) )
+#define netif_tx_start_all_queues(a) netif_start_queue(a)
+#else
+#define netif_tx_start_all_queues(a) do {} while (0)
+#endif
+#define netif_stop_subqueue(_ndev,_qi) netif_stop_queue((_ndev))
+#define netif_start_subqueue(_ndev,_qi) netif_start_queue((_ndev))
+#endif /* HAVE_TX_MQ */
+#ifndef NETIF_F_MULTI_QUEUE
+#define NETIF_F_MULTI_QUEUE 0
+#define netif_is_multiqueue(a) 0
+#define netif_wake_subqueue(a, b)
+#endif /* NETIF_F_MULTI_QUEUE */
+
+#ifndef __WARN_printf
+extern void __kc_warn_slowpath(const char *file, const int line,
+                              const char *fmt, ...)
+    __attribute__ ((format(printf, 3, 4)));
+#define __WARN_printf(arg...) __kc_warn_slowpath(__FILE__, __LINE__, arg)
+#endif /* __WARN_printf */
+
+#ifndef WARN
+#define WARN(condition, format...) ({                                          \
+       int __ret_warn_on = !!(condition);                              \
+       if (unlikely(__ret_warn_on))                                    \
+               __WARN_printf(format);                                  \
+       unlikely(__ret_warn_on);                                        \
+})
+#endif /* WARN */
+#else /* < 2.6.27 */
+#define HAVE_TX_MQ
+#define HAVE_NETDEV_SELECT_QUEUE
+#endif /* < 2.6.27 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) )
+#define pci_ioremap_bar(pdev, bar)     ioremap(pci_resource_start(pdev, bar), \
+                                               pci_resource_len(pdev, bar))
+#define pci_wake_from_d3 _kc_pci_wake_from_d3
+#define pci_prepare_to_sleep _kc_pci_prepare_to_sleep
+extern int _kc_pci_wake_from_d3(struct pci_dev *dev, bool enable);
+extern int _kc_pci_prepare_to_sleep(struct pci_dev *dev);
+#define netdev_alloc_page(a) alloc_page(GFP_ATOMIC)
+#ifndef __skb_queue_head_init
+static inline void __kc_skb_queue_head_init(struct sk_buff_head *list)
+{
+       list->prev = list->next = (struct sk_buff *)list;
+       list->qlen = 0;
+}
+
+#define __skb_queue_head_init(_q) __kc_skb_queue_head_init(_q)
+#endif
+#ifndef skb_add_rx_frag
+#define skb_add_rx_frag _kc_skb_add_rx_frag
+extern void _kc_skb_add_rx_frag(struct sk_buff *, int, struct page *, int, int);
+#endif
+#endif /* < 2.6.28 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) )
+#ifndef swap
+#define swap(a, b) \
+       do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#endif
+#define pci_request_selected_regions_exclusive(pdev, bars, name) \
+               pci_request_selected_regions(pdev, bars, name)
+#ifndef CONFIG_NR_CPUS
+#define CONFIG_NR_CPUS 1
+#endif /* CONFIG_NR_CPUS */
+#ifndef pcie_aspm_enabled
+#define pcie_aspm_enabled()   (1)
+#endif /* pcie_aspm_enabled */
+#else /* < 2.6.29 */
+#ifndef HAVE_NET_DEVICE_OPS
+#define HAVE_NET_DEVICE_OPS
+#endif
+#ifdef CONFIG_DCB
+#define HAVE_PFC_MODE_ENABLE
+#endif /* CONFIG_DCB */
+#endif /* < 2.6.29 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) )
+#define skb_rx_queue_recorded(a) false
+#define skb_get_rx_queue(a) 0
+#define skb_record_rx_queue(a, b) do {} while (0)
+#define skb_tx_hash(n, s) ___kc_skb_tx_hash((n), (s), (n)->real_num_tx_queues)
+#ifdef IXGBE_FCOE
+#undef CONFIG_FCOE
+#undef CONFIG_FCOE_MODULE
+#endif /* IXGBE_FCOE */
+#ifndef CONFIG_PCI_IOV
+#undef pci_enable_sriov
+#define pci_enable_sriov(a, b) -ENOTSUPP
+#undef pci_disable_sriov
+#define pci_disable_sriov(a) do {} while (0)
+#endif /* CONFIG_PCI_IOV */
+#ifndef pr_cont
+#define pr_cont(fmt, ...) \
+       printk(KERN_CONT fmt, ##__VA_ARGS__)
+#endif /* pr_cont */
+#else
+#define HAVE_ASPM_QUIRKS
+#endif /* < 2.6.30 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) )
+#define ETH_P_1588 0x88F7
+#define ETH_P_FIP  0x8914
+#ifndef netdev_uc_count
+#define netdev_uc_count(dev) ((dev)->uc_count)
+#endif
+#ifndef netdev_for_each_uc_addr
+#define netdev_for_each_uc_addr(uclist, dev) \
+       for (uclist = dev->uc_list; uclist; uclist = uclist->next)
+#endif
+#else
+#ifndef HAVE_NETDEV_STORAGE_ADDRESS
+#define HAVE_NETDEV_STORAGE_ADDRESS
+#endif
+#ifndef HAVE_NETDEV_HW_ADDR
+#define HAVE_NETDEV_HW_ADDR
+#endif
+#ifndef HAVE_TRANS_START_IN_QUEUE
+#define HAVE_TRANS_START_IN_QUEUE
+#endif
+#endif /* < 2.6.31 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) )
+#undef netdev_tx_t
+#define netdev_tx_t int
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#ifndef NETIF_F_FCOE_MTU
+#define NETIF_F_FCOE_MTU       (1 << 26)
+#endif
+#endif /* CONFIG_FCOE || CONFIG_FCOE_MODULE */
+
+#ifndef pm_runtime_get_sync
+#define pm_runtime_get_sync(dev)       do {} while (0)
+#endif
+#ifndef pm_runtime_put
+#define pm_runtime_put(dev)            do {} while (0)
+#endif
+#ifndef pm_runtime_put_sync
+#define pm_runtime_put_sync(dev)       do {} while (0)
+#endif
+#ifndef pm_runtime_resume
+#define pm_runtime_resume(dev)         do {} while (0)
+#endif
+#ifndef pm_schedule_suspend
+#define pm_schedule_suspend(dev, t)    do {} while (0)
+#endif
+#ifndef pm_runtime_set_suspended
+#define pm_runtime_set_suspended(dev)  do {} while (0)
+#endif
+#ifndef pm_runtime_disable
+#define pm_runtime_disable(dev)                do {} while (0)
+#endif
+#ifndef pm_runtime_put_noidle
+#define pm_runtime_put_noidle(dev)     do {} while (0)
+#endif
+#ifndef pm_runtime_set_active
+#define pm_runtime_set_active(dev)     do {} while (0)
+#endif
+#ifndef pm_runtime_enable
+#define pm_runtime_enable(dev) do {} while (0)
+#endif
+#ifndef pm_runtime_get_noresume
+#define pm_runtime_get_noresume(dev)   do {} while (0)
+#endif
+#else /* < 2.6.32 */
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#ifndef HAVE_NETDEV_OPS_FCOE_ENABLE
+#define HAVE_NETDEV_OPS_FCOE_ENABLE
+#endif
+#endif /* CONFIG_FCOE || CONFIG_FCOE_MODULE */
+#ifdef CONFIG_DCB
+#ifndef HAVE_DCBNL_OPS_GETAPP
+#define HAVE_DCBNL_OPS_GETAPP
+#endif
+#endif /* CONFIG_DCB */
+#include <linux/pm_runtime.h>
+/* IOV bad DMA target work arounds require at least this kernel rev support */
+#define HAVE_PCIE_TYPE
+#endif /* < 2.6.32 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) )
+#ifndef pci_pcie_cap
+#define pci_pcie_cap(pdev) pci_find_capability(pdev, PCI_CAP_ID_EXP)
+#endif
+#ifndef IPV4_FLOW
+#define IPV4_FLOW 0x10
+#endif /* IPV4_FLOW */
+#ifndef IPV6_FLOW
+#define IPV6_FLOW 0x11
+#endif /* IPV6_FLOW */
+/* Features back-ported to RHEL6 or SLES11 SP1 after 2.6.32 */
+#if ( (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,0)) || \
+      (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(11,1,0)) )
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#ifndef HAVE_NETDEV_OPS_FCOE_GETWWN
+#define HAVE_NETDEV_OPS_FCOE_GETWWN
+#endif
+#endif /* CONFIG_FCOE || CONFIG_FCOE_MODULE */
+#endif /* RHEL6 or SLES11 SP1 */
+#ifndef __percpu
+#define __percpu
+#endif /* __percpu */
+#else /* < 2.6.33 */
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#ifndef HAVE_NETDEV_OPS_FCOE_GETWWN
+#define HAVE_NETDEV_OPS_FCOE_GETWWN
+#endif
+#endif /* CONFIG_FCOE || CONFIG_FCOE_MODULE */
+#define HAVE_ETHTOOL_SFP_DISPLAY_PORT
+#endif /* < 2.6.33 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) )
+#ifndef ETH_FLAG_NTUPLE
+#define ETH_FLAG_NTUPLE NETIF_F_NTUPLE
+#endif
+
+#ifndef netdev_mc_count
+#define netdev_mc_count(dev) ((dev)->mc_count)
+#endif
+#ifndef netdev_mc_empty
+#define netdev_mc_empty(dev) (netdev_mc_count(dev) == 0)
+#endif
+#ifndef netdev_for_each_mc_addr
+#define netdev_for_each_mc_addr(mclist, dev) \
+       for (mclist = dev->mc_list; mclist; mclist = mclist->next)
+#endif
+#ifndef netdev_uc_count
+#define netdev_uc_count(dev) ((dev)->uc.count)
+#endif
+#ifndef netdev_uc_empty
+#define netdev_uc_empty(dev) (netdev_uc_count(dev) == 0)
+#endif
+#ifndef netdev_for_each_uc_addr
+#define netdev_for_each_uc_addr(ha, dev) \
+       list_for_each_entry(ha, &dev->uc.list, list)
+#endif
+#ifndef dma_set_coherent_mask
+#define dma_set_coherent_mask(dev,mask) \
+       pci_set_consistent_dma_mask(to_pci_dev(dev),(mask))
+#endif
+#ifndef pci_dev_run_wake
+#define pci_dev_run_wake(pdev) (0)
+#endif
+
+/* netdev logging taken from include/linux/netdevice.h */
+#ifndef netdev_name
+static inline const char *_kc_netdev_name(const struct net_device *dev)
+{
+       if (dev->reg_state != NETREG_REGISTERED)
+               return "(unregistered net_device)";
+       return dev->name;
+}
+
+#define netdev_name(netdev)    _kc_netdev_name(netdev)
+#endif /* netdev_name */
+
+#undef netdev_printk
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
+#define netdev_printk(level, netdev, format, args...)          \
+do {                                                           \
+       struct adapter_struct *kc_adapter = netdev_priv(netdev);\
+       struct pci_dev *pdev = kc_adapter->pdev;                \
+       printk("%s %s: " format, level, pci_name(pdev),         \
+              ##args);                                         \
+} while(0)
+#elif ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) )
+#define netdev_printk(level, netdev, format, args...)          \
+do {                                                           \
+       struct adapter_struct *kc_adapter = netdev_priv(netdev);\
+       struct pci_dev *pdev = kc_adapter->pdev;                \
+       struct device *dev = pci_dev_to_dev(pdev);              \
+       dev_printk(level, dev, "%s: " format,                   \
+                  netdev_name(netdev), ##args);                \
+} while(0)
+#else /* 2.6.21 => 2.6.34 */
+#define netdev_printk(level, netdev, format, args...)          \
+       dev_printk(level, (netdev)->dev.parent,                 \
+                  "%s: " format,                               \
+                  netdev_name(netdev), ##args)
+#endif /* <2.6.0 <2.6.21 <2.6.34 */
+#undef netdev_emerg
+#define netdev_emerg(dev, format, args...)                     \
+       netdev_printk(KERN_EMERG, dev, format, ##args)
+#undef netdev_alert
+#define netdev_alert(dev, format, args...)                     \
+       netdev_printk(KERN_ALERT, dev, format, ##args)
+#undef netdev_crit
+#define netdev_crit(dev, format, args...)                      \
+       netdev_printk(KERN_CRIT, dev, format, ##args)
+#undef netdev_err
+#define netdev_err(dev, format, args...)                       \
+       netdev_printk(KERN_ERR, dev, format, ##args)
+#undef netdev_warn
+#define netdev_warn(dev, format, args...)                      \
+       netdev_printk(KERN_WARNING, dev, format, ##args)
+#undef netdev_notice
+#define netdev_notice(dev, format, args...)                    \
+       netdev_printk(KERN_NOTICE, dev, format, ##args)
+#undef netdev_info
+#define netdev_info(dev, format, args...)                      \
+       netdev_printk(KERN_INFO, dev, format, ##args)
+#undef netdev_dbg
+#if defined(DEBUG)
+#define netdev_dbg(__dev, format, args...)                     \
+       netdev_printk(KERN_DEBUG, __dev, format, ##args)
+#elif defined(CONFIG_DYNAMIC_DEBUG)
+#define netdev_dbg(__dev, format, args...)                     \
+do {                                                           \
+       dynamic_dev_dbg((__dev)->dev.parent, "%s: " format,     \
+                       netdev_name(__dev), ##args);            \
+} while (0)
+#else /* DEBUG */
+#define netdev_dbg(__dev, format, args...)                     \
+({                                                             \
+       if (0)                                                  \
+               netdev_printk(KERN_DEBUG, __dev, format, ##args); \
+       0;                                                      \
+})
+#endif /* DEBUG */
+
+#undef netif_printk
+#define netif_printk(priv, type, level, dev, fmt, args...)     \
+do {                                                           \
+       if (netif_msg_##type(priv))                             \
+               netdev_printk(level, (dev), fmt, ##args);       \
+} while (0)
+
+#undef netif_emerg
+#define netif_emerg(priv, type, dev, fmt, args...)             \
+       netif_level(emerg, priv, type, dev, fmt, ##args)
+#undef netif_alert
+#define netif_alert(priv, type, dev, fmt, args...)             \
+       netif_level(alert, priv, type, dev, fmt, ##args)
+#undef netif_crit
+#define netif_crit(priv, type, dev, fmt, args...)              \
+       netif_level(crit, priv, type, dev, fmt, ##args)
+#undef netif_err
+#define netif_err(priv, type, dev, fmt, args...)               \
+       netif_level(err, priv, type, dev, fmt, ##args)
+#undef netif_warn
+#define netif_warn(priv, type, dev, fmt, args...)              \
+       netif_level(warn, priv, type, dev, fmt, ##args)
+#undef netif_notice
+#define netif_notice(priv, type, dev, fmt, args...)            \
+       netif_level(notice, priv, type, dev, fmt, ##args)
+#undef netif_info
+#define netif_info(priv, type, dev, fmt, args...)              \
+       netif_level(info, priv, type, dev, fmt, ##args)
+
+#ifdef SET_SYSTEM_SLEEP_PM_OPS
+#define HAVE_SYSTEM_SLEEP_PM_OPS
+#endif
+
+#ifndef for_each_set_bit
+#define for_each_set_bit(bit, addr, size) \
+       for ((bit) = find_first_bit((addr), (size)); \
+               (bit) < (size); \
+               (bit) = find_next_bit((addr), (size), (bit) + 1))
+#endif /* for_each_set_bit */
+
+#ifndef DEFINE_DMA_UNMAP_ADDR
+#define DEFINE_DMA_UNMAP_ADDR DECLARE_PCI_UNMAP_ADDR
+#define DEFINE_DMA_UNMAP_LEN DECLARE_PCI_UNMAP_LEN
+#define dma_unmap_addr pci_unmap_addr
+#define dma_unmap_addr_set pci_unmap_addr_set
+#define dma_unmap_len pci_unmap_len
+#define dma_unmap_len_set pci_unmap_len_set
+#endif /* DEFINE_DMA_UNMAP_ADDR */
+#else /* < 2.6.34 */
+#define HAVE_SYSTEM_SLEEP_PM_OPS
+#ifndef HAVE_SET_RX_MODE
+#define HAVE_SET_RX_MODE
+#endif
+
+#endif /* < 2.6.34 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) )
+#ifndef numa_node_id
+#define numa_node_id() 0
+#endif
+#ifdef HAVE_TX_MQ
+#include <net/sch_generic.h>
+#ifndef CONFIG_NETDEVICES_MULTIQUEUE
+void _kc_netif_set_real_num_tx_queues(struct net_device *, unsigned int);
+#define netif_set_real_num_tx_queues  _kc_netif_set_real_num_tx_queues
+#else /* CONFIG_NETDEVICES_MULTI_QUEUE */
+#define netif_set_real_num_tx_queues(_netdev, _count) \
+       do { \
+               (_netdev)->egress_subqueue_count = _count; \
+       } while (0)
+#endif /* CONFIG_NETDEVICES_MULTI_QUEUE */
+#else
+#define netif_set_real_num_tx_queues(_netdev, _count) do {} while(0)
+#endif /* HAVE_TX_MQ */
+#ifndef ETH_FLAG_RXHASH
+#define ETH_FLAG_RXHASH (1<<28)
+#endif /* ETH_FLAG_RXHASH */
+#else /* < 2.6.35 */
+#define HAVE_PM_QOS_REQUEST_LIST
+#define HAVE_IRQ_AFFINITY_HINT
+#endif /* < 2.6.35 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) )
+extern int _kc_ethtool_op_set_flags(struct net_device *, u32, u32);
+#define ethtool_op_set_flags _kc_ethtool_op_set_flags
+extern u32 _kc_ethtool_op_get_flags(struct net_device *);
+#define ethtool_op_get_flags _kc_ethtool_op_get_flags
+
+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+#ifdef NET_IP_ALIGN
+#undef NET_IP_ALIGN
+#endif
+#define NET_IP_ALIGN 0
+#endif /* CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS */
+
+#ifdef NET_SKB_PAD
+#undef NET_SKB_PAD
+#endif
+
+#if (L1_CACHE_BYTES > 32)
+#define NET_SKB_PAD L1_CACHE_BYTES
+#else
+#define NET_SKB_PAD 32
+#endif
+
+static inline struct sk_buff *_kc_netdev_alloc_skb_ip_align(struct net_device
+                                                           *dev,
+                                                           unsigned int length)
+{
+       struct sk_buff *skb;
+
+       skb = alloc_skb(length + NET_SKB_PAD + NET_IP_ALIGN, GFP_ATOMIC);
+       if (skb) {
+#if (NET_IP_ALIGN + NET_SKB_PAD)
+               skb_reserve(skb, NET_IP_ALIGN + NET_SKB_PAD);
+#endif
+               skb->dev = dev;
+       }
+       return skb;
+}
+
+#ifdef netdev_alloc_skb_ip_align
+#undef netdev_alloc_skb_ip_align
+#endif
+#define netdev_alloc_skb_ip_align(n, l) _kc_netdev_alloc_skb_ip_align(n, l)
+
+#undef netif_level
+#define netif_level(level, priv, type, dev, fmt, args...)      \
+do {                                                           \
+       if (netif_msg_##type(priv))                             \
+               netdev_##level(dev, fmt, ##args);               \
+} while (0)
+
+#undef usleep_range
+#define usleep_range(min, max) msleep(DIV_ROUND_UP(min, 1000))
+
+#else /* < 2.6.36 */
+#define HAVE_PM_QOS_REQUEST_ACTIVE
+#define HAVE_8021P_SUPPORT
+#define HAVE_NDO_GET_STATS64
+#endif /* < 2.6.36 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) )
+#ifndef ETHTOOL_RXNTUPLE_ACTION_CLEAR
+#define ETHTOOL_RXNTUPLE_ACTION_CLEAR (-2)
+#endif
+#ifndef VLAN_N_VID
+#define VLAN_N_VID     VLAN_GROUP_ARRAY_LEN
+#endif /* VLAN_N_VID */
+#ifndef ETH_FLAG_TXVLAN
+#define ETH_FLAG_TXVLAN (1 << 7)
+#endif /* ETH_FLAG_TXVLAN */
+#ifndef ETH_FLAG_RXVLAN
+#define ETH_FLAG_RXVLAN (1 << 8)
+#endif /* ETH_FLAG_RXVLAN */
+
+static inline void _kc_skb_checksum_none_assert(struct sk_buff *skb)
+{
+       WARN_ON(skb->ip_summed != CHECKSUM_NONE);
+}
+
+#define skb_checksum_none_assert(skb) _kc_skb_checksum_none_assert(skb)
+
+static inline void *_kc_vzalloc_node(unsigned long size, int node)
+{
+       void *addr = vmalloc_node(size, node);
+       if (addr)
+               memset(addr, 0, size);
+       return addr;
+}
+
+#define vzalloc_node(_size, _node) _kc_vzalloc_node(_size, _node)
+
+static inline void *_kc_vzalloc(unsigned long size)
+{
+       void *addr = vmalloc(size);
+       if (addr)
+               memset(addr, 0, size);
+       return addr;
+}
+
+#define vzalloc(_size) _kc_vzalloc(_size)
+
+#ifndef vlan_get_protocol
+static inline __be16 __kc_vlan_get_protocol(const struct sk_buff *skb)
+{
+       if (vlan_tx_tag_present(skb) ||
+           skb->protocol != cpu_to_be16(ETH_P_8021Q))
+               return skb->protocol;
+
+       if (skb_headlen(skb) < sizeof(struct vlan_ethhdr))
+               return 0;
+
+       return ((struct vlan_ethhdr *)skb->data)->h_vlan_encapsulated_proto;
+}
+
+#define vlan_get_protocol(_skb) __kc_vlan_get_protocol(_skb)
+#endif
+#ifdef HAVE_HW_TIME_STAMP
+#define SKBTX_HW_TSTAMP (1 << 0)
+#define SKBTX_IN_PROGRESS (1 << 2)
+#define SKB_SHARED_TX_IS_UNION
+#endif
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,4,18) )
+#ifndef HAVE_VLAN_RX_REGISTER
+#define HAVE_VLAN_RX_REGISTER
+#endif
+#endif /* > 2.4.18 */
+#endif /* < 2.6.37 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) )
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) )
+#define skb_checksum_start_offset(skb) skb_transport_offset(skb)
+#else /* 2.6.22 -> 2.6.37 */
+static inline int _kc_skb_checksum_start_offset(const struct sk_buff *skb)
+{
+       return skb->csum_start - skb_headroom(skb);
+}
+
+#define skb_checksum_start_offset(skb) _kc_skb_checksum_start_offset(skb)
+#endif /* 2.6.22 -> 2.6.37 */
+#ifdef CONFIG_DCB
+#ifndef IEEE_8021QAZ_MAX_TCS
+#define IEEE_8021QAZ_MAX_TCS 8
+#endif
+#ifndef DCB_CAP_DCBX_HOST
+#define DCB_CAP_DCBX_HOST              0x01
+#endif
+#ifndef DCB_CAP_DCBX_LLD_MANAGED
+#define DCB_CAP_DCBX_LLD_MANAGED       0x02
+#endif
+#ifndef DCB_CAP_DCBX_VER_CEE
+#define DCB_CAP_DCBX_VER_CEE           0x04
+#endif
+#ifndef DCB_CAP_DCBX_VER_IEEE
+#define DCB_CAP_DCBX_VER_IEEE          0x08
+#endif
+#ifndef DCB_CAP_DCBX_STATIC
+#define DCB_CAP_DCBX_STATIC            0x10
+#endif
+#endif /* CONFIG_DCB */
+extern u16 ___kc_skb_tx_hash(struct net_device *, const struct sk_buff *, u16);
+#define __skb_tx_hash(n, s, q) ___kc_skb_tx_hash((n), (s), (q))
+#else /* < 2.6.38 */
+#endif /* < 2.6.38 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) )
+#ifndef skb_queue_reverse_walk_safe
+#define skb_queue_reverse_walk_safe(queue, skb, tmp)                           \
+               for (skb = (queue)->prev, tmp = skb->prev;                      \
+                    skb != (struct sk_buff *)(queue);                          \
+                    skb = tmp, tmp = skb->prev)
+#endif
+#else /* < 2.6.39 */
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#ifndef HAVE_NETDEV_OPS_FCOE_DDP_TARGET
+#define HAVE_NETDEV_OPS_FCOE_DDP_TARGET
+#endif
+#endif /* CONFIG_FCOE || CONFIG_FCOE_MODULE */
+#ifndef HAVE_MQPRIO
+#define HAVE_MQPRIO
+#endif
+#ifndef HAVE_SETUP_TC
+#define HAVE_SETUP_TC
+#endif
+#ifdef CONFIG_DCB
+#ifndef HAVE_DCBNL_IEEE
+#define HAVE_DCBNL_IEEE
+#endif
+#endif /* CONFIG_DCB */
+#ifndef HAVE_NDO_SET_FEATURES
+#define HAVE_NDO_SET_FEATURES
+#endif
+#endif /* < 2.6.39 */
+
+/*****************************************************************************/
+/* use < 2.6.40 because of a Fedora 15 kernel update where they
+ * updated the kernel version to 2.6.40.x and they back-ported 3.0 features
+ * like set_phys_id for ethtool.
+ */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40) )
+#ifdef ETHTOOL_GRXRINGS
+#ifndef FLOW_EXT
+#define        FLOW_EXT        0x80000000
+union _kc_ethtool_flow_union {
+       struct ethtool_tcpip4_spec tcp_ip4_spec;
+       struct ethtool_usrip4_spec usr_ip4_spec;
+       __u8 hdata[60];
+};
+struct _kc_ethtool_flow_ext {
+       __be16 vlan_etype;
+       __be16 vlan_tci;
+       __be32 data[2];
+};
+struct _kc_ethtool_rx_flow_spec {
+       __u32 flow_type;
+       union _kc_ethtool_flow_union h_u;
+       struct _kc_ethtool_flow_ext h_ext;
+       union _kc_ethtool_flow_union m_u;
+       struct _kc_ethtool_flow_ext m_ext;
+       __u64 ring_cookie;
+       __u32 location;
+};
+#define ethtool_rx_flow_spec _kc_ethtool_rx_flow_spec
+#endif /* FLOW_EXT */
+#endif
+
+#define pci_disable_link_state_locked pci_disable_link_state
+
+#ifndef PCI_LTR_VALUE_MASK
+#define  PCI_LTR_VALUE_MASK    0x000003ff
+#endif
+#ifndef PCI_LTR_SCALE_MASK
+#define  PCI_LTR_SCALE_MASK    0x00001c00
+#endif
+#ifndef PCI_LTR_SCALE_SHIFT
+#define  PCI_LTR_SCALE_SHIFT   10
+#endif
+
+#else /* < 2.6.40 */
+#define HAVE_ETHTOOL_SET_PHYS_ID
+#endif /* < 2.6.40 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) )
+#ifndef __netdev_alloc_skb_ip_align
+#define __netdev_alloc_skb_ip_align(d,l,_g) netdev_alloc_skb_ip_align(d,l)
+#endif /* __netdev_alloc_skb_ip_align */
+#define dcb_ieee_setapp(dev, app) dcb_setapp(dev, app)
+#define dcb_ieee_delapp(dev, app) 0
+#define dcb_ieee_getapp_mask(dev, app) (1 << app->priority)
+#else /* < 3.1.0 */
+#ifndef HAVE_DCBNL_IEEE_DELAPP
+#define HAVE_DCBNL_IEEE_DELAPP
+#endif
+#endif /* < 3.1.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) )
+#ifdef ETHTOOL_GRXRINGS
+#define HAVE_ETHTOOL_GET_RXNFC_VOID_RULE_LOCS
+#endif /* ETHTOOL_GRXRINGS */
+
+#ifndef skb_frag_size
+#define skb_frag_size(frag)    _kc_skb_frag_size(frag)
+static inline unsigned int _kc_skb_frag_size(const skb_frag_t * frag)
+{
+       return frag->size;
+}
+#endif /* skb_frag_size */
+
+#ifndef skb_frag_size_sub
+#define skb_frag_size_sub(frag, delta) _kc_skb_frag_size_sub(frag, delta)
+static inline void _kc_skb_frag_size_sub(skb_frag_t * frag, int delta)
+{
+       frag->size -= delta;
+}
+#endif /* skb_frag_size_sub */
+
+#ifndef skb_frag_page
+#define skb_frag_page(frag)    _kc_skb_frag_page(frag)
+static inline struct page *_kc_skb_frag_page(const skb_frag_t * frag)
+{
+       return frag->page;
+}
+#endif /* skb_frag_page */
+
+#ifndef skb_frag_address
+#define skb_frag_address(frag) _kc_skb_frag_address(frag)
+static inline void *_kc_skb_frag_address(const skb_frag_t * frag)
+{
+       return page_address(skb_frag_page(frag)) + frag->page_offset;
+}
+#endif /* skb_frag_address */
+
+#ifndef skb_frag_dma_map
+#define skb_frag_dma_map(dev,frag,offset,size,dir) \
+               _kc_skb_frag_dma_map(dev,frag,offset,size,dir)
+static inline dma_addr_t _kc_skb_frag_dma_map(struct device *dev,
+                                             const skb_frag_t * frag,
+                                             size_t offset, size_t size,
+                                             enum dma_data_direction dir)
+{
+       return dma_map_page(dev, skb_frag_page(frag),
+                           frag->page_offset + offset, size, dir);
+}
+#endif /* skb_frag_dma_map */
+
+#ifndef __skb_frag_unref
+#define __skb_frag_unref(frag) __kc_skb_frag_unref(frag)
+static inline void __kc_skb_frag_unref(skb_frag_t * frag)
+{
+       put_page(skb_frag_page(frag));
+}
+#endif /* __skb_frag_unref */
+#else /* < 3.2.0 */
+#ifndef HAVE_PCI_DEV_FLAGS_ASSIGNED
+#define HAVE_PCI_DEV_FLAGS_ASSIGNED
+#define HAVE_VF_SPOOFCHK_CONFIGURE
+#endif
+#endif /* < 3.2.0 */
+
+#if (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE == RHEL_RELEASE_VERSION(6,2))
+#undef ixgbe_get_netdev_tc_txq
+#define ixgbe_get_netdev_tc_txq(dev, tc) (&netdev_extended(dev)->qos_data.tc_to_txq[tc])
+#endif
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) )
+//typedef u32 netdev_features_t;
+#else /* ! < 3.3.0 */
+#define HAVE_INT_NDO_VLAN_RX_ADD_VID
+#ifdef ETHTOOL_SRXNTUPLE
+#undef ETHTOOL_SRXNTUPLE
+#endif
+#endif /* < 3.3.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) )
+#ifndef NETIF_F_RXFCS
+#define NETIF_F_RXFCS  0
+#endif /* NETIF_F_RXFCS */
+#ifndef NETIF_F_RXALL
+#define NETIF_F_RXALL  0
+#endif /* NETIF_F_RXALL */
+
+#define NUMTCS_RETURNS_U8
+
+#include <linux/highmem.h>
+static inline void *_kc_kmap_atomic(struct page *page)
+{
+       return kmap_atomic(page, KM_SKB_DATA_SOFTIRQ);
+}
+
+#undef kmap_atomic
+#define kmap_atomic(page) _kc_kmap_atomic((page))
+
+static inline void _kc_kunmap_atomic(void *addr)
+{
+       kunmap_atomic(addr, KM_SKB_DATA_SOFTIRQ);
+}
+
+#undef kunmap_atomic
+#define kunmap_atomic(addr) _kc_kunmap_atomic((addr))
+
+#endif /* < 3.4.0 */
+
+/*****************************************************************************/
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) )
+#else
+#define HAVE_FDB_OPS
+#endif /* < 3.5.0 */
+#endif /* _KCOMPAT_H_ */
diff --git a/drivers/net/e1000e/kcompat_ethtool.c b/drivers/net/e1000e/kcompat_ethtool.c
new file mode 100644 (file)
index 0000000..4c99eb7
--- /dev/null
@@ -0,0 +1,1176 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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
+
+*******************************************************************************/
+
+/*
+ * net/core/ethtool.c - Ethtool ioctl handler
+ * Copyright (c) 2003 Matthew Wilcox <matthew@wil.cx>
+ *
+ * This file is where we call all the ethtool_ops commands to get
+ * the information ethtool needs.  We fall back to calling do_ioctl()
+ * for drivers which haven't been converted to ethtool_ops yet.
+ *
+ * It's GPL, stupid.
+ *
+ * Modification by sfeldma@pobox.com to work as backward compat
+ * solution for pre-ethtool_ops kernels.
+ *     - copied struct ethtool_ops from ethtool.h
+ *     - defined SET_ETHTOOL_OPS
+ *     - put in some #ifndef NETIF_F_xxx wrappers
+ *     - changes refs to dev->ethtool_ops to ethtool_ops
+ *     - changed dev_ethtool to ethtool_ioctl
+ *      - remove EXPORT_SYMBOL()s
+ *      - added _kc_ prefix in built-in ethtool_op_xxx ops.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/netdevice.h>
+#include <asm/uaccess.h>
+
+#include "kcompat.h"
+
+#undef SUPPORTED_10000baseT_Full
+#define SUPPORTED_10000baseT_Full      (1 << 12)
+#undef ADVERTISED_10000baseT_Full
+#define ADVERTISED_10000baseT_Full     (1 << 12)
+#undef SPEED_10000
+#define SPEED_10000            10000
+
+#undef ethtool_ops
+#define ethtool_ops _kc_ethtool_ops
+
+struct _kc_ethtool_ops {
+       int (*get_settings) (struct net_device *, struct ethtool_cmd *);
+       int (*set_settings) (struct net_device *, struct ethtool_cmd *);
+       void (*get_drvinfo) (struct net_device *, struct ethtool_drvinfo *);
+       int (*get_regs_len) (struct net_device *);
+       void (*get_regs) (struct net_device *, struct ethtool_regs *, void *);
+       void (*get_wol) (struct net_device *, struct ethtool_wolinfo *);
+       int (*set_wol) (struct net_device *, struct ethtool_wolinfo *);
+       u32 (*get_msglevel) (struct net_device *);
+       void (*set_msglevel) (struct net_device *, u32);
+       int (*nway_reset) (struct net_device *);
+       u32 (*get_link) (struct net_device *);
+       int (*get_eeprom_len) (struct net_device *);
+       int (*get_eeprom) (struct net_device *, struct ethtool_eeprom *, u8 *);
+       int (*set_eeprom) (struct net_device *, struct ethtool_eeprom *, u8 *);
+       int (*get_coalesce) (struct net_device *, struct ethtool_coalesce *);
+       int (*set_coalesce) (struct net_device *, struct ethtool_coalesce *);
+       void (*get_ringparam) (struct net_device *, struct ethtool_ringparam *);
+       int (*set_ringparam) (struct net_device *, struct ethtool_ringparam *);
+       void (*get_pauseparam) (struct net_device *,
+                               struct ethtool_pauseparam *);
+       int (*set_pauseparam) (struct net_device *,
+                              struct ethtool_pauseparam *);
+       u32 (*get_rx_csum) (struct net_device *);
+       int (*set_rx_csum) (struct net_device *, u32);
+       u32 (*get_tx_csum) (struct net_device *);
+       int (*set_tx_csum) (struct net_device *, u32);
+       u32 (*get_sg) (struct net_device *);
+       int (*set_sg) (struct net_device *, u32);
+       u32 (*get_tso) (struct net_device *);
+       int (*set_tso) (struct net_device *, u32);
+       int (*self_test_count) (struct net_device *);
+       void (*self_test) (struct net_device *, struct ethtool_test *, u64 *);
+       void (*get_strings) (struct net_device *, u32 stringset, u8 *);
+       int (*phys_id) (struct net_device *, u32);
+       int (*get_stats_count) (struct net_device *);
+       void (*get_ethtool_stats) (struct net_device *, struct ethtool_stats *,
+                                  u64 *);
+} *ethtool_ops = NULL;
+
+#undef SET_ETHTOOL_OPS
+#define SET_ETHTOOL_OPS(netdev, ops) (ethtool_ops = (ops))
+
+/*
+ * Some useful ethtool_ops methods that are device independent. If we find that
+ * all drivers want to do the same thing here, we can turn these into dev_()
+ * function calls.
+ */
+
+#undef ethtool_op_get_link
+#define ethtool_op_get_link _kc_ethtool_op_get_link
+u32 _kc_ethtool_op_get_link(struct net_device *dev)
+{
+       return netif_carrier_ok(dev) ? 1 : 0;
+}
+
+#undef ethtool_op_get_tx_csum
+#define ethtool_op_get_tx_csum _kc_ethtool_op_get_tx_csum
+u32 _kc_ethtool_op_get_tx_csum(struct net_device *dev)
+{
+#ifdef NETIF_F_IP_CSUM
+       return (dev->features & NETIF_F_IP_CSUM) != 0;
+#else
+       return 0;
+#endif
+}
+
+#undef ethtool_op_set_tx_csum
+#define ethtool_op_set_tx_csum _kc_ethtool_op_set_tx_csum
+int _kc_ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
+{
+#ifdef NETIF_F_IP_CSUM
+       if (data)
+#ifdef NETIF_F_IPV6_CSUM
+               dev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+       else
+               dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+#else
+               dev->features |= NETIF_F_IP_CSUM;
+       else
+               dev->features &= ~NETIF_F_IP_CSUM;
+#endif
+#endif
+
+       return 0;
+}
+
+#undef ethtool_op_get_sg
+#define ethtool_op_get_sg _kc_ethtool_op_get_sg
+u32 _kc_ethtool_op_get_sg(struct net_device *dev)
+{
+#ifdef NETIF_F_SG
+       return (dev->features & NETIF_F_SG) != 0;
+#else
+       return 0;
+#endif
+}
+
+#undef ethtool_op_set_sg
+#define ethtool_op_set_sg _kc_ethtool_op_set_sg
+int _kc_ethtool_op_set_sg(struct net_device *dev, u32 data)
+{
+#ifdef NETIF_F_SG
+       if (data)
+               dev->features |= NETIF_F_SG;
+       else
+               dev->features &= ~NETIF_F_SG;
+#endif
+
+       return 0;
+}
+
+#undef ethtool_op_get_tso
+#define ethtool_op_get_tso _kc_ethtool_op_get_tso
+u32 _kc_ethtool_op_get_tso(struct net_device *dev)
+{
+#ifdef NETIF_F_TSO
+       return (dev->features & NETIF_F_TSO) != 0;
+#else
+       return 0;
+#endif
+}
+
+#undef ethtool_op_set_tso
+#define ethtool_op_set_tso _kc_ethtool_op_set_tso
+int _kc_ethtool_op_set_tso(struct net_device *dev, u32 data)
+{
+#ifdef NETIF_F_TSO
+       if (data)
+               dev->features |= NETIF_F_TSO;
+       else
+               dev->features &= ~NETIF_F_TSO;
+#endif
+
+       return 0;
+}
+
+/* Handlers for each ethtool command */
+
+static int ethtool_get_settings(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_cmd cmd = { ETHTOOL_GSET };
+       int err;
+
+       if (!ethtool_ops->get_settings)
+               return -EOPNOTSUPP;
+
+       err = ethtool_ops->get_settings(dev, &cmd);
+       if (err < 0)
+               return err;
+
+       if (copy_to_user(useraddr, &cmd, sizeof(cmd)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_settings(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_cmd cmd;
+
+       if (!ethtool_ops->set_settings)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
+               return -EFAULT;
+
+       return ethtool_ops->set_settings(dev, &cmd);
+}
+
+static int ethtool_get_drvinfo(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_drvinfo info;
+       struct ethtool_ops *ops = ethtool_ops;
+
+       if (!ops->get_drvinfo)
+               return -EOPNOTSUPP;
+
+       memset(&info, 0, sizeof(info));
+       info.cmd = ETHTOOL_GDRVINFO;
+       ops->get_drvinfo(dev, &info);
+
+       if (ops->self_test_count)
+               info.testinfo_len = ops->self_test_count(dev);
+       if (ops->get_stats_count)
+               info.n_stats = ops->get_stats_count(dev);
+       if (ops->get_regs_len)
+               info.regdump_len = ops->get_regs_len(dev);
+       if (ops->get_eeprom_len)
+               info.eedump_len = ops->get_eeprom_len(dev);
+
+       if (copy_to_user(useraddr, &info, sizeof(info)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_get_regs(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_regs regs;
+       struct ethtool_ops *ops = ethtool_ops;
+       void *regbuf;
+       int reglen, ret;
+
+       if (!ops->get_regs || !ops->get_regs_len)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&regs, useraddr, sizeof(regs)))
+               return -EFAULT;
+
+       reglen = ops->get_regs_len(dev);
+       if (regs.len > reglen)
+               regs.len = reglen;
+
+       regbuf = kmalloc(reglen, GFP_USER);
+       if (!regbuf)
+               return -ENOMEM;
+
+       ops->get_regs(dev, &regs, regbuf);
+
+       ret = -EFAULT;
+       if (copy_to_user(useraddr, &regs, sizeof(regs)))
+               goto out;
+       useraddr += offsetof(struct ethtool_regs, data);
+       if (copy_to_user(useraddr, regbuf, reglen))
+               goto out;
+       ret = 0;
+
+out:
+       kfree(regbuf);
+       return ret;
+}
+
+static int ethtool_get_wol(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_wolinfo wol = { ETHTOOL_GWOL };
+
+       if (!ethtool_ops->get_wol)
+               return -EOPNOTSUPP;
+
+       ethtool_ops->get_wol(dev, &wol);
+
+       if (copy_to_user(useraddr, &wol, sizeof(wol)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_wol(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_wolinfo wol;
+
+       if (!ethtool_ops->set_wol)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&wol, useraddr, sizeof(wol)))
+               return -EFAULT;
+
+       return ethtool_ops->set_wol(dev, &wol);
+}
+
+static int ethtool_get_msglevel(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GMSGLVL };
+
+       if (!ethtool_ops->get_msglevel)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_msglevel(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_msglevel(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata;
+
+       if (!ethtool_ops->set_msglevel)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&edata, useraddr, sizeof(edata)))
+               return -EFAULT;
+
+       ethtool_ops->set_msglevel(dev, edata.data);
+       return 0;
+}
+
+static int ethtool_nway_reset(struct net_device *dev)
+{
+       if (!ethtool_ops->nway_reset)
+               return -EOPNOTSUPP;
+
+       return ethtool_ops->nway_reset(dev);
+}
+
+static int ethtool_get_link(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GLINK };
+
+       if (!ethtool_ops->get_link)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_link(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_get_eeprom(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_eeprom eeprom;
+       struct ethtool_ops *ops = ethtool_ops;
+       u8 *data;
+       int ret;
+
+       if (!ops->get_eeprom || !ops->get_eeprom_len)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
+               return -EFAULT;
+
+       /* Check for wrap and zero */
+       if (eeprom.offset + eeprom.len <= eeprom.offset)
+               return -EINVAL;
+
+       /* Check for exceeding total eeprom len */
+       if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
+               return -EINVAL;
+
+       data = kmalloc(eeprom.len, GFP_USER);
+       if (!data)
+               return -ENOMEM;
+
+       ret = -EFAULT;
+       if (copy_from_user(data, useraddr + sizeof(eeprom), eeprom.len))
+               goto out;
+
+       ret = ops->get_eeprom(dev, &eeprom, data);
+       if (ret)
+               goto out;
+
+       ret = -EFAULT;
+       if (copy_to_user(useraddr, &eeprom, sizeof(eeprom)))
+               goto out;
+       if (copy_to_user(useraddr + sizeof(eeprom), data, eeprom.len))
+               goto out;
+       ret = 0;
+
+out:
+       kfree(data);
+       return ret;
+}
+
+static int ethtool_set_eeprom(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_eeprom eeprom;
+       struct ethtool_ops *ops = ethtool_ops;
+       u8 *data;
+       int ret;
+
+       if (!ops->set_eeprom || !ops->get_eeprom_len)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))
+               return -EFAULT;
+
+       /* Check for wrap and zero */
+       if (eeprom.offset + eeprom.len <= eeprom.offset)
+               return -EINVAL;
+
+       /* Check for exceeding total eeprom len */
+       if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))
+               return -EINVAL;
+
+       data = kmalloc(eeprom.len, GFP_USER);
+       if (!data)
+               return -ENOMEM;
+
+       ret = -EFAULT;
+       if (copy_from_user(data, useraddr + sizeof(eeprom), eeprom.len))
+               goto out;
+
+       ret = ops->set_eeprom(dev, &eeprom, data);
+       if (ret)
+               goto out;
+
+       if (copy_to_user(useraddr + sizeof(eeprom), data, eeprom.len))
+               ret = -EFAULT;
+
+out:
+       kfree(data);
+       return ret;
+}
+
+static int ethtool_get_coalesce(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_coalesce coalesce = { ETHTOOL_GCOALESCE };
+
+       if (!ethtool_ops->get_coalesce)
+               return -EOPNOTSUPP;
+
+       ethtool_ops->get_coalesce(dev, &coalesce);
+
+       if (copy_to_user(useraddr, &coalesce, sizeof(coalesce)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_coalesce(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_coalesce coalesce;
+
+       if (!ethtool_ops->get_coalesce)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&coalesce, useraddr, sizeof(coalesce)))
+               return -EFAULT;
+
+       return ethtool_ops->set_coalesce(dev, &coalesce);
+}
+
+static int ethtool_get_ringparam(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_ringparam ringparam = { ETHTOOL_GRINGPARAM };
+
+       if (!ethtool_ops->get_ringparam)
+               return -EOPNOTSUPP;
+
+       ethtool_ops->get_ringparam(dev, &ringparam);
+
+       if (copy_to_user(useraddr, &ringparam, sizeof(ringparam)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_ringparam(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_ringparam ringparam;
+
+       if (!ethtool_ops->get_ringparam)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&ringparam, useraddr, sizeof(ringparam)))
+               return -EFAULT;
+
+       return ethtool_ops->set_ringparam(dev, &ringparam);
+}
+
+static int ethtool_get_pauseparam(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_pauseparam pauseparam = { ETHTOOL_GPAUSEPARAM };
+
+       if (!ethtool_ops->get_pauseparam)
+               return -EOPNOTSUPP;
+
+       ethtool_ops->get_pauseparam(dev, &pauseparam);
+
+       if (copy_to_user(useraddr, &pauseparam, sizeof(pauseparam)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_pauseparam(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_pauseparam pauseparam;
+
+       if (!ethtool_ops->get_pauseparam)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&pauseparam, useraddr, sizeof(pauseparam)))
+               return -EFAULT;
+
+       return ethtool_ops->set_pauseparam(dev, &pauseparam);
+}
+
+static int ethtool_get_rx_csum(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GRXCSUM };
+
+       if (!ethtool_ops->get_rx_csum)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_rx_csum(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_rx_csum(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata;
+
+       if (!ethtool_ops->set_rx_csum)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&edata, useraddr, sizeof(edata)))
+               return -EFAULT;
+
+       ethtool_ops->set_rx_csum(dev, edata.data);
+       return 0;
+}
+
+static int ethtool_get_tx_csum(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GTXCSUM };
+
+       if (!ethtool_ops->get_tx_csum)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_tx_csum(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_tx_csum(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata;
+
+       if (!ethtool_ops->set_tx_csum)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&edata, useraddr, sizeof(edata)))
+               return -EFAULT;
+
+       return ethtool_ops->set_tx_csum(dev, edata.data);
+}
+
+static int ethtool_get_sg(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GSG };
+
+       if (!ethtool_ops->get_sg)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_sg(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_sg(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata;
+
+       if (!ethtool_ops->set_sg)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&edata, useraddr, sizeof(edata)))
+               return -EFAULT;
+
+       return ethtool_ops->set_sg(dev, edata.data);
+}
+
+static int ethtool_get_tso(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata = { ETHTOOL_GTSO };
+
+       if (!ethtool_ops->get_tso)
+               return -EOPNOTSUPP;
+
+       edata.data = ethtool_ops->get_tso(dev);
+
+       if (copy_to_user(useraddr, &edata, sizeof(edata)))
+               return -EFAULT;
+       return 0;
+}
+
+static int ethtool_set_tso(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_value edata;
+
+       if (!ethtool_ops->set_tso)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&edata, useraddr, sizeof(edata)))
+               return -EFAULT;
+
+       return ethtool_ops->set_tso(dev, edata.data);
+}
+
+static int ethtool_self_test(struct net_device *dev, char *useraddr)
+{
+       struct ethtool_test test;
+       struct ethtool_ops *ops = ethtool_ops;
+       u64 *data;
+       int ret;
+
+       if (!ops->self_test || !ops->self_test_count)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&test, useraddr, sizeof(test)))
+               return -EFAULT;
+
+       test.len = ops->self_test_count(dev);
+       data = kmalloc(test.len * sizeof(u64), GFP_USER);
+       if (!data)
+               return -ENOMEM;
+
+       ops->self_test(dev, &test, data);
+
+       ret = -EFAULT;
+       if (copy_to_user(useraddr, &test, sizeof(test)))
+               goto out;
+       useraddr += sizeof(test);
+       if (copy_to_user(useraddr, data, test.len * sizeof(u64)))
+               goto out;
+       ret = 0;
+
+out:
+       kfree(data);
+       return ret;
+}
+
+static int ethtool_get_strings(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_gstrings gstrings;
+       struct ethtool_ops *ops = ethtool_ops;
+       u8 *data;
+       int ret;
+
+       if (!ops->get_strings)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&gstrings, useraddr, sizeof(gstrings)))
+               return -EFAULT;
+
+       switch (gstrings.string_set) {
+       case ETH_SS_TEST:
+               if (!ops->self_test_count)
+                       return -EOPNOTSUPP;
+               gstrings.len = ops->self_test_count(dev);
+               break;
+       case ETH_SS_STATS:
+               if (!ops->get_stats_count)
+                       return -EOPNOTSUPP;
+               gstrings.len = ops->get_stats_count(dev);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER);
+       if (!data)
+               return -ENOMEM;
+
+       ops->get_strings(dev, gstrings.string_set, data);
+
+       ret = -EFAULT;
+       if (copy_to_user(useraddr, &gstrings, sizeof(gstrings)))
+               goto out;
+       useraddr += sizeof(gstrings);
+       if (copy_to_user(useraddr, data, gstrings.len * ETH_GSTRING_LEN))
+               goto out;
+       ret = 0;
+
+out:
+       kfree(data);
+       return ret;
+}
+
+static int ethtool_phys_id(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_value id;
+
+       if (!ethtool_ops->phys_id)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&id, useraddr, sizeof(id)))
+               return -EFAULT;
+
+       return ethtool_ops->phys_id(dev, id.data);
+}
+
+static int ethtool_get_stats(struct net_device *dev, void *useraddr)
+{
+       struct ethtool_stats stats;
+       struct ethtool_ops *ops = ethtool_ops;
+       u64 *data;
+       int ret;
+
+       if (!ops->get_ethtool_stats || !ops->get_stats_count)
+               return -EOPNOTSUPP;
+
+       if (copy_from_user(&stats, useraddr, sizeof(stats)))
+               return -EFAULT;
+
+       stats.n_stats = ops->get_stats_count(dev);
+       data = kmalloc(stats.n_stats * sizeof(u64), GFP_USER);
+       if (!data)
+               return -ENOMEM;
+
+       ops->get_ethtool_stats(dev, &stats, data);
+
+       ret = -EFAULT;
+       if (copy_to_user(useraddr, &stats, sizeof(stats)))
+               goto out;
+       useraddr += sizeof(stats);
+       if (copy_to_user(useraddr, data, stats.n_stats * sizeof(u64)))
+               goto out;
+       ret = 0;
+
+out:
+       kfree(data);
+       return ret;
+}
+
+/* The main entry point in this file.  Called from net/core/dev.c */
+
+#define ETHTOOL_OPS_COMPAT
+int ethtool_ioctl(struct ifreq *ifr)
+{
+       struct net_device *dev = __dev_get_by_name(ifr->ifr_name);
+       void *useraddr = (void *)ifr->ifr_data;
+       u32 ethcmd;
+
+       /*
+        * XXX: This can be pushed down into the ethtool_* handlers that
+        * need it.  Keep existing behavior for the moment.
+        */
+       if (!capable(CAP_NET_ADMIN))
+               return -EPERM;
+
+       if (!dev || !netif_device_present(dev))
+               return -ENODEV;
+
+       if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
+               return -EFAULT;
+
+       switch (ethcmd) {
+       case ETHTOOL_GSET:
+               return ethtool_get_settings(dev, useraddr);
+       case ETHTOOL_SSET:
+               return ethtool_set_settings(dev, useraddr);
+       case ETHTOOL_GDRVINFO:
+               return ethtool_get_drvinfo(dev, useraddr);
+       case ETHTOOL_GREGS:
+               return ethtool_get_regs(dev, useraddr);
+       case ETHTOOL_GWOL:
+               return ethtool_get_wol(dev, useraddr);
+       case ETHTOOL_SWOL:
+               return ethtool_set_wol(dev, useraddr);
+       case ETHTOOL_GMSGLVL:
+               return ethtool_get_msglevel(dev, useraddr);
+       case ETHTOOL_SMSGLVL:
+               return ethtool_set_msglevel(dev, useraddr);
+       case ETHTOOL_NWAY_RST:
+               return ethtool_nway_reset(dev);
+       case ETHTOOL_GLINK:
+               return ethtool_get_link(dev, useraddr);
+       case ETHTOOL_GEEPROM:
+               return ethtool_get_eeprom(dev, useraddr);
+       case ETHTOOL_SEEPROM:
+               return ethtool_set_eeprom(dev, useraddr);
+       case ETHTOOL_GCOALESCE:
+               return ethtool_get_coalesce(dev, useraddr);
+       case ETHTOOL_SCOALESCE:
+               return ethtool_set_coalesce(dev, useraddr);
+       case ETHTOOL_GRINGPARAM:
+               return ethtool_get_ringparam(dev, useraddr);
+       case ETHTOOL_SRINGPARAM:
+               return ethtool_set_ringparam(dev, useraddr);
+       case ETHTOOL_GPAUSEPARAM:
+               return ethtool_get_pauseparam(dev, useraddr);
+       case ETHTOOL_SPAUSEPARAM:
+               return ethtool_set_pauseparam(dev, useraddr);
+       case ETHTOOL_GRXCSUM:
+               return ethtool_get_rx_csum(dev, useraddr);
+       case ETHTOOL_SRXCSUM:
+               return ethtool_set_rx_csum(dev, useraddr);
+       case ETHTOOL_GTXCSUM:
+               return ethtool_get_tx_csum(dev, useraddr);
+       case ETHTOOL_STXCSUM:
+               return ethtool_set_tx_csum(dev, useraddr);
+       case ETHTOOL_GSG:
+               return ethtool_get_sg(dev, useraddr);
+       case ETHTOOL_SSG:
+               return ethtool_set_sg(dev, useraddr);
+       case ETHTOOL_GTSO:
+               return ethtool_get_tso(dev, useraddr);
+       case ETHTOOL_STSO:
+               return ethtool_set_tso(dev, useraddr);
+       case ETHTOOL_TEST:
+               return ethtool_self_test(dev, useraddr);
+       case ETHTOOL_GSTRINGS:
+               return ethtool_get_strings(dev, useraddr);
+       case ETHTOOL_PHYS_ID:
+               return ethtool_phys_id(dev, useraddr);
+       case ETHTOOL_GSTATS:
+               return ethtool_get_stats(dev, useraddr);
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return -EOPNOTSUPP;
+}
+
+#define mii_if_info _kc_mii_if_info
+struct _kc_mii_if_info {
+       int phy_id;
+       int advertising;
+       int phy_id_mask;
+       int reg_num_mask;
+
+       unsigned int full_duplex:1;     /* is full duplex? */
+       unsigned int force_media:1;     /* is autoneg. disabled? */
+
+       struct net_device *dev;
+       int (*mdio_read) (struct net_device * dev, int phy_id, int location);
+       void (*mdio_write) (struct net_device * dev, int phy_id, int location,
+                           int val);
+};
+
+struct ethtool_cmd;
+struct mii_ioctl_data;
+
+#undef mii_link_ok
+#define mii_link_ok _kc_mii_link_ok
+#undef mii_nway_restart
+#define mii_nway_restart _kc_mii_nway_restart
+#undef mii_ethtool_gset
+#define mii_ethtool_gset _kc_mii_ethtool_gset
+#undef mii_ethtool_sset
+#define mii_ethtool_sset _kc_mii_ethtool_sset
+#undef mii_check_link
+#define mii_check_link _kc_mii_check_link
+extern int _kc_mii_link_ok(struct mii_if_info *mii);
+extern int _kc_mii_nway_restart(struct mii_if_info *mii);
+extern int _kc_mii_ethtool_gset(struct mii_if_info *mii,
+                               struct ethtool_cmd *ecmd);
+extern int _kc_mii_ethtool_sset(struct mii_if_info *mii,
+                               struct ethtool_cmd *ecmd);
+extern void _kc_mii_check_link(struct mii_if_info *mii);
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,4,6) )
+#undef generic_mii_ioctl
+#define generic_mii_ioctl _kc_generic_mii_ioctl
+extern int _kc_generic_mii_ioctl(struct mii_if_info *mii_if,
+                                struct mii_ioctl_data *mii_data, int cmd,
+                                unsigned int *duplex_changed);
+#endif /* > 2.4.6 */
+
+struct _kc_pci_dev_ext {
+       struct pci_dev *dev;
+       void *pci_drvdata;
+       struct pci_driver *driver;
+};
+
+struct _kc_net_dev_ext {
+       struct net_device *dev;
+       unsigned int carrier;
+};
+
+/**************************************/
+/* mii support */
+
+int _kc_mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
+{
+       struct net_device *dev = mii->dev;
+       u32 advert, bmcr, lpa, nego;
+
+       ecmd->supported =
+           (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
+            SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |
+            SUPPORTED_Autoneg | SUPPORTED_TP | SUPPORTED_MII);
+
+       /* only supports twisted-pair */
+       ecmd->port = PORT_MII;
+
+       /* only supports internal transceiver */
+       ecmd->transceiver = XCVR_INTERNAL;
+
+       /* this isn't fully supported at higher layers */
+       ecmd->phy_address = mii->phy_id;
+
+       ecmd->advertising = ADVERTISED_TP | ADVERTISED_MII;
+       advert = mii->mdio_read(dev, mii->phy_id, MII_ADVERTISE);
+       if (advert & ADVERTISE_10HALF)
+               ecmd->advertising |= ADVERTISED_10baseT_Half;
+       if (advert & ADVERTISE_10FULL)
+               ecmd->advertising |= ADVERTISED_10baseT_Full;
+       if (advert & ADVERTISE_100HALF)
+               ecmd->advertising |= ADVERTISED_100baseT_Half;
+       if (advert & ADVERTISE_100FULL)
+               ecmd->advertising |= ADVERTISED_100baseT_Full;
+
+       bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);
+       lpa = mii->mdio_read(dev, mii->phy_id, MII_LPA);
+       if (bmcr & BMCR_ANENABLE) {
+               ecmd->advertising |= ADVERTISED_Autoneg;
+               ecmd->autoneg = AUTONEG_ENABLE;
+
+               nego = mii_nway_result(advert & lpa);
+               if (nego == LPA_100FULL || nego == LPA_100HALF)
+                       ecmd->speed = SPEED_100;
+               else
+                       ecmd->speed = SPEED_10;
+               if (nego == LPA_100FULL || nego == LPA_10FULL) {
+                       ecmd->duplex = DUPLEX_FULL;
+                       mii->full_duplex = 1;
+               } else {
+                       ecmd->duplex = DUPLEX_HALF;
+                       mii->full_duplex = 0;
+               }
+       } else {
+               ecmd->autoneg = AUTONEG_DISABLE;
+
+               ecmd->speed = (bmcr & BMCR_SPEED100) ? SPEED_100 : SPEED_10;
+               ecmd->duplex =
+                   (bmcr & BMCR_FULLDPLX) ? DUPLEX_FULL : DUPLEX_HALF;
+       }
+
+       /* ignore maxtxpkt, maxrxpkt for now */
+
+       return 0;
+}
+
+int _kc_mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
+{
+       struct net_device *dev = mii->dev;
+
+       if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100)
+               return -EINVAL;
+       if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
+               return -EINVAL;
+       if (ecmd->port != PORT_MII)
+               return -EINVAL;
+       if (ecmd->transceiver != XCVR_INTERNAL)
+               return -EINVAL;
+       if (ecmd->phy_address != mii->phy_id)
+               return -EINVAL;
+       if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE)
+               return -EINVAL;
+
+       /* ignore supported, maxtxpkt, maxrxpkt */
+
+       if (ecmd->autoneg == AUTONEG_ENABLE) {
+               u32 bmcr, advert, tmp;
+
+               if ((ecmd->advertising & (ADVERTISED_10baseT_Half |
+                                         ADVERTISED_10baseT_Full |
+                                         ADVERTISED_100baseT_Half |
+                                         ADVERTISED_100baseT_Full)) == 0)
+                       return -EINVAL;
+
+               /* advertise only what has been requested */
+               advert = mii->mdio_read(dev, mii->phy_id, MII_ADVERTISE);
+               tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
+               if (ADVERTISED_10baseT_Half)
+                       tmp |= ADVERTISE_10HALF;
+               if (ADVERTISED_10baseT_Full)
+                       tmp |= ADVERTISE_10FULL;
+               if (ADVERTISED_100baseT_Half)
+                       tmp |= ADVERTISE_100HALF;
+               if (ADVERTISED_100baseT_Full)
+                       tmp |= ADVERTISE_100FULL;
+               if (advert != tmp) {
+                       mii->mdio_write(dev, mii->phy_id, MII_ADVERTISE, tmp);
+                       mii->advertising = tmp;
+               }
+
+               /* turn on autonegotiation, and force a renegotiate */
+               bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);
+               bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
+               mii->mdio_write(dev, mii->phy_id, MII_BMCR, bmcr);
+
+               mii->force_media = 0;
+       } else {
+               u32 bmcr, tmp;
+
+               /* turn off auto negotiation, set speed and duplexity */
+               bmcr = mii->mdio_read(dev, mii->phy_id, MII_BMCR);
+               tmp = bmcr & ~(BMCR_ANENABLE | BMCR_SPEED100 | BMCR_FULLDPLX);
+               if (ecmd->speed == SPEED_100)
+                       tmp |= BMCR_SPEED100;
+               if (ecmd->duplex == DUPLEX_FULL) {
+                       tmp |= BMCR_FULLDPLX;
+                       mii->full_duplex = 1;
+               } else
+                       mii->full_duplex = 0;
+               if (bmcr != tmp)
+                       mii->mdio_write(dev, mii->phy_id, MII_BMCR, tmp);
+
+               mii->force_media = 1;
+       }
+       return 0;
+}
+
+int _kc_mii_link_ok(struct mii_if_info *mii)
+{
+       /* first, a dummy read, needed to latch some MII phys */
+       mii->mdio_read(mii->dev, mii->phy_id, MII_BMSR);
+       if (mii->mdio_read(mii->dev, mii->phy_id, MII_BMSR) & BMSR_LSTATUS)
+               return 1;
+       return 0;
+}
+
+int _kc_mii_nway_restart(struct mii_if_info *mii)
+{
+       int bmcr;
+       int r = -EINVAL;
+
+       /* if autoneg is off, it's an error */
+       bmcr = mii->mdio_read(mii->dev, mii->phy_id, MII_BMCR);
+
+       if (bmcr & BMCR_ANENABLE) {
+               bmcr |= BMCR_ANRESTART;
+               mii->mdio_write(mii->dev, mii->phy_id, MII_BMCR, bmcr);
+               r = 0;
+       }
+
+       return r;
+}
+
+void _kc_mii_check_link(struct mii_if_info *mii)
+{
+       int cur_link = mii_link_ok(mii);
+       int prev_link = netif_carrier_ok(mii->dev);
+
+       if (cur_link && !prev_link)
+               netif_carrier_on(mii->dev);
+       else if (prev_link && !cur_link)
+               netif_carrier_off(mii->dev);
+}
+
+#if ( LINUX_VERSION_CODE > KERNEL_VERSION(2,4,6) )
+int _kc_generic_mii_ioctl(struct mii_if_info *mii_if,
+                         struct mii_ioctl_data *mii_data, int cmd,
+                         unsigned int *duplex_chg_out)
+{
+       int rc = 0;
+       unsigned int duplex_changed = 0;
+
+       if (duplex_chg_out)
+               *duplex_chg_out = 0;
+
+       mii_data->phy_id &= mii_if->phy_id_mask;
+       mii_data->reg_num &= mii_if->reg_num_mask;
+
+       switch (cmd) {
+       case SIOCDEVPRIVATE:    /* binary compat, remove in 2.5 */
+       case SIOCGMIIPHY:
+               mii_data->phy_id = mii_if->phy_id;
+               /* fall through */
+
+       case SIOCDEVPRIVATE + 1:        /* binary compat, remove in 2.5 */
+       case SIOCGMIIREG:
+               mii_data->val_out =
+                   mii_if->mdio_read(mii_if->dev, mii_data->phy_id,
+                                     mii_data->reg_num);
+               break;
+
+       case SIOCDEVPRIVATE + 2:        /* binary compat, remove in 2.5 */
+       case SIOCSMIIREG:{
+                       u16 val = mii_data->val_in;
+
+                       if (!capable(CAP_NET_ADMIN))
+                               return -EPERM;
+
+                       if (mii_data->phy_id == mii_if->phy_id) {
+                               switch (mii_data->reg_num) {
+                               case MII_BMCR:{
+                                               unsigned int new_duplex = 0;
+                                               if (val &
+                                                   (BMCR_RESET |
+                                                    BMCR_ANENABLE))
+                                                       mii_if->force_media = 0;
+                                               else
+                                                       mii_if->force_media = 1;
+                                               if (mii_if->force_media &&
+                                                   (val & BMCR_FULLDPLX))
+                                                       new_duplex = 1;
+                                               if (mii_if->full_duplex !=
+                                                   new_duplex) {
+                                                       duplex_changed = 1;
+                                                       mii_if->full_duplex =
+                                                           new_duplex;
+                                               }
+                                               break;
+                                       }
+                               case MII_ADVERTISE:
+                                       mii_if->advertising = val;
+                                       break;
+                               default:
+                                       /* do nothing */
+                                       break;
+                               }
+                       }
+
+                       mii_if->mdio_write(mii_if->dev, mii_data->phy_id,
+                                          mii_data->reg_num, val);
+                       break;
+               }
+
+       default:
+               rc = -EOPNOTSUPP;
+               break;
+       }
+
+       if ((rc == 0) && (duplex_chg_out) && (duplex_changed))
+               *duplex_chg_out = 1;
+
+       return rc;
+}
+#endif /* > 2.4.6 */
index 17991e63083d628856c5b4d5f3d810c97868bb15..e3d931fd7b9277cff27fa899c14defff90203f50 100644 (file)
 
 #include "e1000.h"
 
+static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw);
+static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
+static void e1000e_config_collision_dist_generic(struct e1000_hw *hw);
+
+/**
+ *  e1000_init_mac_ops_generic - Initialize MAC function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Setups up the function pointers to no-op functions
+ **/
+void e1000_init_mac_ops_generic(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       /* General Setup */
+       mac->ops.set_lan_id = e1000_set_lan_id_multi_port_pcie;
+       mac->ops.read_mac_addr = e1000_read_mac_addr_generic;
+       mac->ops.config_collision_dist = e1000e_config_collision_dist_generic;
+       /* LINK */
+       mac->ops.wait_autoneg = e1000_wait_autoneg;
+       /* Management */
+       mac->ops.mng_host_if_write = e1000_mng_host_if_write;
+       mac->ops.mng_write_cmd_header = e1000_mng_write_cmd_header;
+       mac->ops.mng_enable_host_if = e1000_mng_enable_host_if;
+       /* VLAN, MC, etc. */
+       mac->ops.rar_set = e1000e_rar_set;
+       mac->ops.validate_mdi_setting = e1000_validate_mdi_setting_generic;
+}
+
 /**
  *  e1000e_get_bus_info_pcie - Get PCIe bus information
  *  @hw: pointer to the HW structure
@@ -40,16 +68,29 @@ 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;
+       s32 ret_val;
+       u16 pcie_link_status;
 
-       cap_offset = adapter->pdev->pcie_cap;
-       if (!cap_offset) {
+       bus->type = e1000_bus_type_pci_express;
+
+       ret_val = e1000_read_pcie_cap_reg(hw, PCIE_LINK_STATUS,
+                                         &pcie_link_status);
+       if (ret_val) {
                bus->width = e1000_bus_width_unknown;
+               bus->speed = e1000_bus_speed_unknown;
        } else {
-               pci_read_config_word(adapter->pdev,
-                                    cap_offset + PCIE_LINK_STATUS,
-                                    &pcie_link_status);
+               switch (pcie_link_status & PCIE_LINK_SPEED_MASK) {
+               case PCIE_LINK_SPEED_2500:
+                       bus->speed = e1000_bus_speed_2500;
+                       break;
+               case PCIE_LINK_SPEED_5000:
+                       bus->speed = e1000_bus_speed_5000;
+                       break;
+               default:
+                       bus->speed = e1000_bus_speed_unknown;
+                       break;
+               }
+
                bus->width = (enum e1000_bus_width)((pcie_link_status &
                                                     PCIE_LINK_WIDTH_MASK) >>
                                                    PCIE_LINK_WIDTH_SHIFT);
@@ -68,7 +109,7 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
  *  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)
+static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw)
 {
        struct e1000_bus_info *bus = &hw->bus;
        u32 reg;
@@ -263,8 +304,7 @@ void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
  *  @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()
+ *  the multicast filter table array address and new table value.
  **/
 static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
 {
@@ -465,7 +505,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
         * of MAC speed/duplex configuration.  So we only need to
         * configure Collision Distance in the MAC.
         */
-       e1000e_config_collision_dist(hw);
+       mac->ops.config_collision_dist(hw);
 
        /*
         * Configure Flow Control now that Auto-Neg has completed.
@@ -630,7 +670,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
        if (E1000_TXCW_ANE & er32(TXCW)) {
                status = er32(STATUS);
                if (status & E1000_STATUS_LU) {
-                       /* SYNCH bit and IV bit are sticky, so reread rxcw.  */
+                       /* SYNCH bit and IV bit are sticky, so reread rxcw. */
                        udelay(10);
                        rxcw = er32(RXCW);
                        if (rxcw & E1000_RXCW_SYNCH) {
@@ -682,7 +722,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
                return ret_val;
        }
 
-       if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
+       if (!(nvm_data & NVM_WORD0F_PAUSE_MASK))
                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;
@@ -693,7 +733,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_setup_link - Setup flow control and link settings
+ *  e1000e_setup_link_generic - Setup flow control and link settings
  *  @hw: pointer to the HW structure
  *
  *  Determines which flow control settings to use, then configures flow
@@ -702,16 +742,15 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
  *  should be established.  Assumes the hardware has previously been reset
  *  and the transmitter and receiver are not enabled.
  **/
-s32 e1000e_setup_link(struct e1000_hw *hw)
+s32 e1000e_setup_link_generic(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))
+       if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                return 0;
 
        /*
@@ -733,7 +772,7 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
        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);
+       ret_val = hw->mac.ops.setup_physical_interface(hw);
        if (ret_val)
                return ret_val;
 
@@ -890,7 +929,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
        /* Take the link out of reset */
        ctrl &= ~E1000_CTRL_LRST;
 
-       e1000e_config_collision_dist(hw);
+       hw->mac.ops.config_collision_dist(hw);
 
        ret_val = e1000_commit_fc_settings_generic(hw);
        if (ret_val)
@@ -925,14 +964,13 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_config_collision_dist - Configure collision distance
+ *  e1000e_config_collision_dist_generic - Configure collision distance
  *  @hw: pointer to the HW structure
  *
  *  Configures the collision distance to the default value and is used
- *  during link setup. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
+ *  during link setup.
  **/
-void e1000e_config_collision_dist(struct e1000_hw *hw)
+static void e1000e_config_collision_dist_generic(struct e1000_hw *hw)
 {
        u32 tctl;
 
@@ -971,7 +1009,9 @@ s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
                 * XON frames.
                 */
                fcrtl = hw->fc.low_water;
-               fcrtl |= E1000_FCRTL_XONE;
+               if (hw->fc.send_xon)
+                       fcrtl |= E1000_FCRTL_XONE;
+
                fcrth = hw->fc.high_water;
        }
        ew32(FCRTL, fcrtl);
@@ -1111,8 +1151,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                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);
+               ret_val = e1e_rphy(hw, PHY_LP_ABILITY,
+                                  &mii_nway_lp_ability_reg);
                if (ret_val)
                        return ret_val;
 
@@ -1276,8 +1316,8 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
  *  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)
+s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw,
+                                            u16 *speed, u16 *duplex)
 {
        *speed = SPEED_1000;
        *duplex = FULL_DUPLEX;
@@ -1399,11 +1439,11 @@ s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data)
 }
 
 /**
- *  e1000e_id_led_init -
+ *  e1000e_id_led_init_generic -
  *  @hw: pointer to the HW structure
  *
  **/
-s32 e1000e_id_led_init(struct e1000_hw *hw)
+s32 e1000e_id_led_init_generic(struct e1000_hw *hw)
 {
        struct e1000_mac_info *mac = &hw->mac;
        s32 ret_val;
@@ -1700,11 +1740,28 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                        }
                }
        } else {
-               if (mac->in_ifs_mode &&
-                   (mac->tx_packet_delta <= MIN_NUM_XMITS)) {
+               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);
                }
        }
 }
+
+/**
+ *  e1000_validate_mdi_setting_generic - Verify MDI/MDIx settings
+ *  @hw: pointer to the HW structure
+ *
+ *  Verify that when not using auto-negotiation that MDI/MDIx is correctly
+ *  set, which is forced to MDI mode only.
+ **/
+static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw)
+{
+       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
+               e_dbg("Invalid MDI setting detected\n");
+               hw->phy.mdix = 1;
+               return -E1000_ERR_CONFIG;
+       }
+
+       return 0;
+}
diff --git a/drivers/net/e1000e/mac.h b/drivers/net/e1000e/mac.h
new file mode 100644 (file)
index 0000000..8740ea3
--- /dev/null
@@ -0,0 +1,75 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_MAC_H_
+#define _E1000_MAC_H_
+
+/*
+ * Functions that should not be called directly from drivers but can be used
+ * by other files in this 'shared code'
+ */
+void e1000_init_mac_ops_generic(struct e1000_hw *hw);
+s32 e1000e_blink_led_generic(struct e1000_hw *hw);
+s32 e1000e_check_for_copper_link(struct e1000_hw *hw);
+s32 e1000e_check_for_fiber_link(struct e1000_hw *hw);
+s32 e1000e_check_for_serdes_link(struct e1000_hw *hw);
+s32 e1000e_cleanup_led_generic(struct e1000_hw *hw);
+s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw);
+s32 e1000e_disable_pcie_master(struct e1000_hw *hw);
+s32 e1000e_force_mac_fc(struct e1000_hw *hw);
+s32 e1000e_get_auto_rd_done(struct e1000_hw *hw);
+s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw);
+void e1000_set_lan_id_single_port(struct e1000_hw *hw);
+s32 e1000e_get_hw_semaphore(struct e1000_hw *hw);
+s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
+                                      u16 *duplex);
+s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw,
+                                            u16 *speed, u16 *duplex);
+s32 e1000e_id_led_init_generic(struct e1000_hw *hw);
+s32 e1000e_led_on_generic(struct e1000_hw *hw);
+s32 e1000e_led_off_generic(struct e1000_hw *hw);
+void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
+                                       u8 *mc_addr_list, u32 mc_addr_count);
+s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
+s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);
+s32 e1000e_setup_led_generic(struct e1000_hw *hw);
+s32 e1000e_setup_link_generic(struct e1000_hw *hw);
+
+void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw);
+void e1000_clear_vfta_generic(struct e1000_hw *hw);
+void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
+void e1000_pcix_mmrbc_workaround_generic(struct e1000_hw *hw);
+void e1000e_put_hw_semaphore(struct e1000_hw *hw);
+void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
+s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);
+void e1000e_reset_adaptive(struct e1000_hw *hw);
+void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
+void e1000e_update_adaptive(struct e1000_hw *hw);
+void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
+
+#endif
index 0d24b13ce7631fb1af30eba53cda5a0e67633aa5..3ae6db9708ad3161db87cdfe92b47802588074e5 100644 (file)
 
 #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
-
 /**
  *  e1000_calculate_checksum - Calculate checksum for buffer
  *  @buffer: pointer to EEPROM
@@ -56,7 +43,6 @@ static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
 
        if (!buffer)
                return 0;
-
        for (i = 0; i < length; i++)
                sum += buffer[i];
 
@@ -73,7 +59,7 @@ static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
  *  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)
+s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
 {
        u32 hicr;
        u8 i;
@@ -85,7 +71,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
 
        /* Check that the host interface is enabled. */
        hicr = er32(HICR);
-       if ((hicr & E1000_HICR_EN) == 0) {
+       if (!(hicr & E1000_HICR_EN)) {
                e_dbg("E1000_HOST_EN bit disabled.\n");
                return -E1000_ERR_HOST_INTERFACE_COMMAND;
        }
@@ -106,7 +92,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_check_mng_mode_generic - check management mode
+ *  e1000e_check_mng_mode_generic - Generic check management mode
  *  @hw: pointer to the HW structure
  *
  *  Reads the firmware semaphore register and returns true (>0) if
@@ -138,7 +124,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
        hw->mac.tx_pkt_filtering = true;
 
        /* No manageability, no filtering */
-       if (!e1000e_check_mng_mode(hw)) {
+       if (!hw->mac.ops.check_mng_mode(hw)) {
                hw->mac.tx_pkt_filtering = false;
                return hw->mac.tx_pkt_filtering;
        }
@@ -147,7 +133,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         * If we can't read from the host interface for whatever
         * reason, disable filtering.
         */
-       ret_val = e1000_mng_enable_host_if(hw);
+       ret_val = hw->mac.ops.mng_enable_host_if(hw);
        if (ret_val) {
                hw->mac.tx_pkt_filtering = false;
                return hw->mac.tx_pkt_filtering;
@@ -187,8 +173,8 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
  *
  *  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)
+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);
 
@@ -218,8 +204,8 @@ static s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
  *  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)
+s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
+                           u16 length, u16 offset, u8 *sum)
 {
        u8 *tmp;
        u8 *bufptr = buffer;
@@ -300,18 +286,18 @@ s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
        hdr.checksum = 0;
 
        /* Enable the host interface */
-       ret_val = e1000_mng_enable_host_if(hw);
+       ret_val = hw->mac.ops.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));
+       ret_val = hw->mac.ops.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);
+       ret_val = hw->mac.ops.mng_write_cmd_header(hw, &hdr);
        if (ret_val)
                return ret_val;
 
@@ -358,8 +344,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
                    ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
                     (e1000_mng_mode_pt << 13)))
                        return true;
-       } else if ((manc & E1000_MANC_SMBUS_EN) &&
-                  !(manc & E1000_MANC_ASF_EN)) {
+       } else if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN)) {
                return true;
        }
 
diff --git a/drivers/net/e1000e/manage.h b/drivers/net/e1000e/manage.h
new file mode 100644 (file)
index 0000000..f74ba86
--- /dev/null
@@ -0,0 +1,80 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_MANAGE_H_
+#define _E1000_MANAGE_H_
+
+bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);
+bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
+s32 e1000_mng_enable_host_if(struct e1000_hw *hw);
+s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
+                           u16 length, u16 offset, u8 *sum);
+s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
+                              struct e1000_host_mng_command_header *hdr);
+s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
+bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
+
+enum e1000_mng_mode {
+       e1000_mng_mode_none = 0,
+       e1000_mng_mode_asf,
+       e1000_mng_mode_pt,
+       e1000_mng_mode_ipmi,
+       e1000_mng_mode_host_if_only
+};
+
+#define E1000_FACTPS_MNGCG                     0x20000000
+
+#define E1000_FWSM_MODE_MASK                   0xE
+#define E1000_FWSM_MODE_SHIFT                  1
+
+#define E1000_MNG_IAMT_MODE                    0x3
+#define E1000_MNG_DHCP_COOKIE_LENGTH           0x10
+#define E1000_MNG_DHCP_COOKIE_OFFSET           0x6F0
+#define E1000_MNG_DHCP_COMMAND_TIMEOUT         10
+#define E1000_MNG_DHCP_TX_PAYLOAD_CMD          64
+#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING   0x1
+#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN      0x2
+
+#define E1000_VFTA_ENTRY_SHIFT                 5
+#define E1000_VFTA_ENTRY_MASK                  0x7F
+#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK                0x1F
+
+#define E1000_HI_MAX_BLOCK_BYTE_LENGTH         1792    /* Num of bytes in range */
+#define E1000_HI_MAX_BLOCK_DWORD_LENGTH                448     /* Num of dwords in range */
+#define E1000_HI_COMMAND_TIMEOUT               500     /* Process HI cmd limit */
+#define E1000_HICR_EN                  0x01    /* Enable bit - RO */
+/* Driver sets this bit when done to put command in RAM */
+#define E1000_HICR_C                   0x02
+#define E1000_HICR_SV                  0x04    /* Status Validity */
+#define E1000_HICR_FW_RESET_ENABLE     0x40
+#define E1000_HICR_FW_RESET            0x80
+
+/* Intel(R) Active Management Technology signature */
+#define E1000_IAMT_SIGNATURE           0x544D4149
+
+#endif
index b09d7a6c56d63d675ec95acac331884e3b4d8217..50c4f12e59f51068b467385916f74ae395368ecd 100644 (file)
 #include <linux/tcp.h>
 #include <linux/ipv6.h>
 #include <linux/slab.h>
+#ifdef NETIF_F_TSO
 #include <net/checksum.h>
+#ifdef NETIF_F_TSO6
 #include <net/ip6_checksum.h>
+#endif
+#endif
 #include <linux/mii.h>
 #include <linux/ethtool.h>
+#ifdef NETIF_F_HW_VLAN_TX
 #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>
+#endif
 #include <linux/prefetch.h>
 
 #include "e1000.h"
 
-#define DRV_EXTRAVERSION "-k"
+#ifdef CONFIG_E1000E_NAPI
+#define DRV_EXTRAVERSION "" "-NAPI"
+#else
+#define DRV_EXTRAVERSION ""
+#endif
 
-#define DRV_VERSION "1.9.5" DRV_EXTRAVERSION
+#define DRV_VERSION "2.0.0.1" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
 static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
-static int e1000_set_features(struct net_device *netdev,
-                             netdev_features_t features);
+
+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;
+
+       /* 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;
+}
+
+static struct e1000_info e1000_82571_info = {
+       .mac = e1000_82571,
+       .flags = FLAG_HAS_HW_VLAN_FILTER
+           | FLAG_HAS_JUMBO_FRAMES | FLAG_HAS_WOL | FLAG_APME_IN_CTRL3
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_82571,
+       .get_variants = e1000_get_variants_82571,
+};
+
+static struct e1000_info e1000_82572_info = {
+       .mac = e1000_82572,
+       .flags = FLAG_HAS_HW_VLAN_FILTER
+           | FLAG_HAS_JUMBO_FRAMES | FLAG_HAS_WOL | FLAG_APME_IN_CTRL3
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_82571,
+       .get_variants = e1000_get_variants_82571,
+};
+
+static struct e1000_info e1000_82573_info = {
+       .mac = e1000_82573,
+       .flags = FLAG_HAS_HW_VLAN_FILTER | FLAG_HAS_WOL | FLAG_APME_IN_CTRL3
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_82571,
+       .get_variants = e1000_get_variants_82571,
+};
+
+static 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
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | FLAG_HAS_SMART_POWER_DOWN
+           | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD,
+       .flags2 = FLAG2_CHECK_PHY_HANG
+           | FLAG2_DISABLE_ASPM_L0S | FLAG2_NO_DISABLE_RX | FLAG2_DMA_BURST,
+       .pba = 32,
+       .max_hw_frame_size = DEFAULT_JUMBO,
+       .init_ops = e1000_init_function_pointers_82571,
+       .get_variants = e1000_get_variants_82571,
+};
+
+static struct e1000_info e1000_82583_info = {
+       .mac = e1000_82583,
+       .flags = FLAG_HAS_HW_VLAN_FILTER | FLAG_HAS_WOL | FLAG_APME_IN_CTRL3
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | FLAG_HAS_SMART_POWER_DOWN
+           | FLAG_HAS_AMT | FLAG_HAS_JUMBO_FRAMES | FLAG_HAS_CTRLEXT_ON_LOAD,
+       .flags2 = FLAG2_DISABLE_ASPM_L0S | FLAG2_NO_DISABLE_RX,
+       .pba = 32,
+       .max_hw_frame_size = DEFAULT_JUMBO,
+       .init_ops = e1000_init_function_pointers_82571,
+       .get_variants = e1000_get_variants_82571,
+};
+
+static struct e1000_info e1000_es2_info = {
+       .mac = e1000_80003es2lan,
+       .flags = FLAG_HAS_HW_VLAN_FILTER
+           | FLAG_HAS_JUMBO_FRAMES | FLAG_HAS_WOL | FLAG_APME_IN_CTRL3
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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 */
+       .flags2 = FLAG2_DMA_BURST,
+       .pba = 38,
+       .max_hw_frame_size = DEFAULT_JUMBO,
+       .init_ops = e1000_init_function_pointers_80003es2lan,
+       .get_variants = NULL,
+};
+
+static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /*
+        * 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_ife))
+               adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
+
+       /* Enable workaround for 82579 w/ ME enabled */
+       if ((adapter->hw.mac.type == e1000_pch2lan) &&
+           (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
+               adapter->flags2 |= FLAG2_PCIM2PCI_ARBITER_WA;
+
+       return 0;
+}
+
+static struct e1000_info e1000_ich8_info = {
+       .mac = e1000_ich8lan,
+       .flags = FLAG_HAS_WOL | FLAG_IS_ICH
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | FLAG_HAS_CTRLEXT_ON_LOAD
+           | FLAG_HAS_AMT | FLAG_HAS_FLASH | FLAG_APME_IN_WUC,
+       .pba = 8,
+       .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
+
+static struct e1000_info e1000_ich9_info = {
+       .mac = e1000_ich9lan,
+       .flags = FLAG_HAS_JUMBO_FRAMES | FLAG_IS_ICH | FLAG_HAS_WOL
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | FLAG_HAS_CTRLEXT_ON_LOAD
+           | FLAG_HAS_AMT | FLAG_HAS_FLASH | FLAG_APME_IN_WUC,
+       .pba = 18,
+       .max_hw_frame_size = DEFAULT_JUMBO,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
+
+static struct e1000_info e1000_ich10_info = {
+       .mac = e1000_ich10lan,
+       .flags = FLAG_HAS_JUMBO_FRAMES | FLAG_IS_ICH | FLAG_HAS_WOL
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | FLAG_HAS_CTRLEXT_ON_LOAD
+           | FLAG_HAS_AMT | FLAG_HAS_FLASH | FLAG_APME_IN_WUC,
+       .pba = 18,
+       .max_hw_frame_size = DEFAULT_JUMBO,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
+
+static struct e1000_info e1000_pch_info = {
+       .mac = e1000_pchlan,
+       .flags = FLAG_IS_ICH | FLAG_HAS_WOL
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
+
+static struct e1000_info e1000_pch2_info = {
+       .mac = e1000_pch2lan,
+       .flags = FLAG_IS_ICH | FLAG_HAS_WOL
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
+
+static struct e1000_info e1000_pch_lpt_info = {
+       .mac = e1000_pch_lpt,
+       .flags = FLAG_IS_ICH | FLAG_HAS_WOL
+#ifndef HAVE_NDO_SET_FEATURES
+           | FLAG_RX_CSUM_ENABLED
+#endif
+           | 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,
+       .init_ops = e1000_init_function_pointers_ich8lan,
+       .get_variants = e1000_get_variants_ich8lan,
+};
 
 static const struct e1000_info *e1000_info_tbl[] = {
-       [board_82571]           = &e1000_82571_info,
-       [board_82572]           = &e1000_82572_info,
-       [board_82573]           = &e1000_82573_info,
-       [board_82574]           = &e1000_82574_info,
-       [board_82583]           = &e1000_82583_info,
-       [board_80003es2lan]     = &e1000_es2_info,
-       [board_ich8lan]         = &e1000_ich8_info,
-       [board_ich9lan]         = &e1000_ich9_info,
-       [board_ich10lan]        = &e1000_ich10_info,
-       [board_pchlan]          = &e1000_pch_info,
-       [board_pch2lan]         = &e1000_pch2_info,
+       [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,
+       [board_pch_lpt] = &e1000_pch_lpt_info,
 };
 
 struct e1000_reg_info {
@@ -107,14 +387,14 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
 
        /* Rx Registers */
        {E1000_RCTL, "RCTL"},
-       {E1000_RDLEN, "RDLEN"},
-       {E1000_RDH, "RDH"},
-       {E1000_RDT, "RDT"},
+       {E1000_RDLEN(0), "RDLEN"},
+       {E1000_RDH(0), "RDH"},
+       {E1000_RDT(0), "RDT"},
        {E1000_RDTR, "RDTR"},
        {E1000_RXDCTL(0), "RXDCTL"},
        {E1000_ERT, "ERT"},
-       {E1000_RDBAL, "RDBAL"},
-       {E1000_RDBAH, "RDBAH"},
+       {E1000_RDBAL(0), "RDBAL"},
+       {E1000_RDBAH(0), "RDBAH"},
        {E1000_RDFH, "RDFH"},
        {E1000_RDFT, "RDFT"},
        {E1000_RDFHS, "RDFHS"},
@@ -123,11 +403,11 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
 
        /* Tx Registers */
        {E1000_TCTL, "TCTL"},
-       {E1000_TDBAL, "TDBAL"},
-       {E1000_TDBAH, "TDBAH"},
-       {E1000_TDLEN, "TDLEN"},
-       {E1000_TDH, "TDH"},
-       {E1000_TDT, "TDT"},
+       {E1000_TDBAL(0), "TDBAL"},
+       {E1000_TDBAH(0), "TDBAH"},
+       {E1000_TDLEN(0), "TDLEN"},
+       {E1000_TDH(0), "TDH"},
+       {E1000_TDT(0), "TDT"},
        {E1000_TIDV, "TIDV"},
        {E1000_TXDCTL(0), "TXDCTL"},
        {E1000_TADV, "TADV"},
@@ -206,15 +486,14 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 
        /* Print netdevice Info */
        if (netdev) {
-               dev_info(&adapter->pdev->dev, "Net device Info\n");
+               dev_info(pci_dev_to_dev(adapter->pdev), "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);
+               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");
+       dev_info(pci_dev_to_dev(adapter->pdev), "Register Dump\n");
        pr_info(" Register Name   Value\n");
        for (reginfo = (struct e1000_reg_info *)e1000_reg_info_tbl;
             reginfo->name; reginfo++) {
@@ -225,7 +504,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
        if (!netdev || !netif_running(netdev))
                return;
 
-       dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
+       dev_info(pci_dev_to_dev(adapter->pdev), "Tx Ring Summary\n");
        pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");
        buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
        pr_info(" %5d %5X %5X %016llX %04X %3X %016llX\n",
@@ -239,7 +518,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
        if (!netif_msg_tx_done(adapter))
                goto rx_ring_summary;
 
-       dev_info(&adapter->pdev->dev, "Tx Ring Dump\n");
+       dev_info(pci_dev_to_dev(adapter->pdev), "Tx Ring Dump\n");
 
        /* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)
         *
@@ -285,15 +564,14 @@ static void e1000e_dump(struct e1000_adapter *adapter)
                else
                        next_desc = "";
                pr_info("T%c[0x%03X]    %016llX %016llX %016llX %04X  %3X %016llX %p%s\n",
-                       (!(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, next_desc);
+                    (!(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, next_desc);
 
                if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
                        print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
@@ -303,7 +581,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 
        /* Print Rx Ring Summary */
 rx_ring_summary:
-       dev_info(&adapter->pdev->dev, "Rx Ring Summary\n");
+       dev_info(pci_dev_to_dev(adapter->pdev), "Rx Ring Summary\n");
        pr_info("Queue [NTU] [NTC]\n");
        pr_info(" %5d %5X %5X\n",
                0, rx_ring->next_to_use, rx_ring->next_to_clean);
@@ -312,7 +590,7 @@ rx_ring_summary:
        if (!netif_msg_rx_status(adapter))
                return;
 
-       dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
+       dev_info(pci_dev_to_dev(adapter->pdev), "Rx Ring Dump\n");
        switch (adapter->rx_ps_pages) {
        case 1:
        case 2:
@@ -360,27 +638,30 @@ rx_ring_summary:
                        if (staterr & E1000_RXD_STAT_DD) {
                                /* Descriptor Done */
                                pr_info("%s[0x%03X]     %016llX %016llX %016llX %016llX ---------------- %p%s\n",
-                                       "RWB", 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, next_desc);
+                                    "RWB", 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, next_desc);
                        } else {
                                pr_info("%s[0x%03X]     %016llX %016llX %016llX %016llX %016llX %p%s\n",
-                                       "R  ", 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, next_desc);
+                                    "R  ", 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, next_desc);
 
                                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);
+                                                      DUMP_PREFIX_ADDRESS, 16,
+                                                      1,
+                                                      phys_to_virt
+                                                      (buffer_info->dma),
+                                                      adapter->rx_ps_bsize0,
+                                                      true);
                        }
                }
                break;
@@ -428,17 +709,17 @@ rx_ring_summary:
                        if (staterr & E1000_RXD_STAT_DD) {
                                /* Descriptor Done */
                                pr_info("%s[0x%03X]     %016llX %016llX ---------------- %p%s\n",
-                                       "RWB", i,
-                                       (unsigned long long)le64_to_cpu(u1->a),
-                                       (unsigned long long)le64_to_cpu(u1->b),
-                                       buffer_info->skb, next_desc);
+                                    "RWB", i,
+                                    (unsigned long long)le64_to_cpu(u1->a),
+                                    (unsigned long long)le64_to_cpu(u1->b),
+                                    buffer_info->skb, next_desc);
                        } else {
                                pr_info("%s[0x%03X]     %016llX %016llX %016llX %p%s\n",
-                                       "R  ", i,
-                                       (unsigned long long)le64_to_cpu(u1->a),
-                                       (unsigned long long)le64_to_cpu(u1->b),
-                                       (unsigned long long)buffer_info->dma,
-                                       buffer_info->skb, next_desc);
+                                    "R  ", i,
+                                    (unsigned long long)le64_to_cpu(u1->a),
+                                    (unsigned long long)le64_to_cpu(u1->b),
+                                    (unsigned long long)buffer_info->dma,
+                                    buffer_info->skb, next_desc);
 
                                if (netif_msg_pktdata(adapter))
                                        print_hex_dump(KERN_INFO, "",
@@ -475,13 +756,43 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
                              struct net_device *netdev, struct sk_buff *skb,
                              u8 status, __le16 vlan)
 {
+#ifndef CONFIG_E1000E_NAPI
+       int ret;
+#endif
+#ifndef HAVE_VLAN_RX_REGISTER
        u16 tag = le16_to_cpu(vlan);
+#endif
        skb->protocol = eth_type_trans(skb, netdev);
 
+#ifdef CONFIG_E1000E_NAPI
+#ifdef HAVE_VLAN_RX_REGISTER
+#ifdef NETIF_F_HW_VLAN_TX
+       if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
+               vlan_gro_receive(&adapter->napi, adapter->vlgrp,
+                                le16_to_cpu(vlan), skb);
+       else
+#endif /* NETIF_F_HW_VLAN_TX */
+               napi_gro_receive(&adapter->napi, skb);
+#else /* HAVE_VLAN_RX_REGISTER */
        if (status & E1000_RXD_STAT_VP)
                __vlan_hwaccel_put_tag(skb, tag);
 
        napi_gro_receive(&adapter->napi, skb);
+#endif /* HAVE_VLAN_RX_REGISTER */
+#else /* CONFIG_E1000E_NAPI */
+#ifdef NETIF_F_HW_VLAN_TX
+       if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
+               ret = vlan_hwaccel_rx(skb, adapter->vlgrp, le16_to_cpu(vlan));
+       else
+#endif
+               ret = netif_rx(skb);
+       if (unlikely(ret == NET_RX_DROP))
+               adapter->rx_dropped_backlog++;
+#endif /* CONFIG_E1000E_NAPI */
+#ifndef NETIF_F_GRO
+
+       netdev->last_rx = jiffies;
+#endif
 }
 
 /**
@@ -500,7 +811,11 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
        skb_checksum_none_assert(skb);
 
        /* Rx checksum disabled */
+#ifdef HAVE_NDO_SET_FEATURES
        if (!(adapter->netdev->features & NETIF_F_RXCSUM))
+#else
+       if (!(adapter->flags & FLAG_RX_CSUM_ENABLED))
+#endif
                return;
 
        /* Ignore Checksum bit is set */
@@ -535,43 +850,15 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
        adapter->hw_csum_good++;
 }
 
-/**
- * e1000e_update_tail_wa - helper function for e1000e_update_[rt]dt_wa()
- * @hw: pointer to the HW structure
- * @tail: address of tail descriptor register
- * @i: value to write to tail descriptor register
- *
- * When updating the tail register, the ME could be accessing Host CSR
- * registers at the same time.  Normally, this is handled in h/w by an
- * arbiter but on some parts there is a bug that acknowledges Host accesses
- * later than it should which could result in the descriptor register to
- * have an incorrect value.  Workaround this by checking the FWSM register
- * which has bit 24 set while ME is accessing Host CSR registers, wait
- * if it is set and try again a number of times.
- **/
-static inline s32 e1000e_update_tail_wa(struct e1000_hw *hw, void __iomem *tail,
-                                       unsigned int i)
-{
-       unsigned int j = 0;
-
-       while ((j++ < E1000_ICH_FWSM_PCIM2PCI_COUNT) &&
-              (er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI))
-               udelay(50);
-
-       writel(i, tail);
-
-       if ((j == E1000_ICH_FWSM_PCIM2PCI_COUNT) && (i != readl(tail)))
-               return E1000_ERR_SWFW_SYNC;
-
-       return 0;
-}
-
 static void e1000e_update_rdt_wa(struct e1000_ring *rx_ring, unsigned int i)
 {
        struct e1000_adapter *adapter = rx_ring->adapter;
        struct e1000_hw *hw = &adapter->hw;
+       s32 ret_val = __ew32_prepare(hw);
 
-       if (e1000e_update_tail_wa(hw, rx_ring->tail, i)) {
+       writel(i, rx_ring->tail);
+
+       if (unlikely(!ret_val && (i != readl(rx_ring->tail)))) {
                u32 rctl = er32(RCTL);
                ew32(RCTL, rctl & ~E1000_RCTL_EN);
                e_err("ME firmware caused invalid RDT - resetting\n");
@@ -583,8 +870,11 @@ static void e1000e_update_tdt_wa(struct e1000_ring *tx_ring, unsigned int i)
 {
        struct e1000_adapter *adapter = tx_ring->adapter;
        struct e1000_hw *hw = &adapter->hw;
+       s32 ret_val = __ew32_prepare(hw);
+
+       writel(i, tx_ring->tail);
 
-       if (e1000e_update_tail_wa(hw, tx_ring->tail, i)) {
+       if (unlikely(!ret_val && (i != readl(tx_ring->tail)))) {
                u32 tctl = er32(TCTL);
                ew32(TCTL, tctl & ~E1000_TCTL_EN);
                e_err("ME firmware caused invalid TDT - resetting\n");
@@ -627,11 +917,11 @@ static void e1000_alloc_rx_buffers(struct e1000_ring *rx_ring,
 
                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");
+               buffer_info->dma =
+                   dma_map_single(pci_dev_to_dev(pdev), skb->data,
+                                  adapter->rx_buffer_len, DMA_FROM_DEVICE);
+               if (dma_mapping_error(pci_dev_to_dev(pdev), buffer_info->dma)) {
+                       dev_err(pci_dev_to_dev(pdev), "Rx DMA map failed\n");
                        adapter->rx_dma_failed++;
                        break;
                }
@@ -692,19 +982,23 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_ring *rx_ring,
                                continue;
                        }
                        if (!ps_page->page) {
-                               ps_page->page = alloc_page(gfp);
+                               ps_page->page = alloc_pages_node(adapter->node,
+                                                                gfp, 0);
                                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,
+                       }
+                       if (!ps_page->dma) {
+                               ps_page->dma =
+                                   dma_map_page(pci_dev_to_dev(pdev),
+                                                ps_page->page, 0, PAGE_SIZE,
+                                                DMA_FROM_DEVICE);
+                               if (dma_mapping_error
+                                   (pci_dev_to_dev(pdev), ps_page->dma)) {
+                                       dev_err(pci_dev_to_dev(adapter->pdev),
                                                "Rx DMA page map failed\n");
+                                       ps_page->dma = 0;
                                        adapter->rx_dma_failed++;
                                        goto no_buffers;
                                }
@@ -718,9 +1012,14 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_ring *rx_ring,
                            cpu_to_le64(ps_page->dma);
                }
 
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto map_skb;
+               }
+
                skb = __netdev_alloc_skb_ip_align(netdev,
-                                                 adapter->rx_ps_bsize0,
-                                                 gfp);
+                                                 adapter->rx_ps_bsize0, gfp);
 
                if (!skb) {
                        adapter->alloc_rx_buff_failed++;
@@ -728,11 +1027,13 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_ring *rx_ring,
                }
 
                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");
+
+map_skb:
+               buffer_info->dma =
+                   dma_map_single(pci_dev_to_dev(pdev), skb->data,
+                                  adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
+               if (dma_mapping_error(pci_dev_to_dev(pdev), buffer_info->dma)) {
+                       dev_err(pci_dev_to_dev(pdev), "Rx DMA map failed\n");
                        adapter->rx_dma_failed++;
                        /* cleanup skb */
                        dev_kfree_skb_any(skb);
@@ -766,6 +1067,7 @@ no_buffers:
        rx_ring->next_to_use = i;
 }
 
+#ifdef CONFIG_E1000E_NAPI
 /**
  * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
  * @rx_ring: Rx descriptor ring
@@ -782,7 +1084,7 @@ static void e1000_alloc_jumbo_rx_buffers(struct e1000_ring *rx_ring,
        struct e1000_buffer *buffer_info;
        struct sk_buff *skb;
        unsigned int i;
-       unsigned int bufsz = 256 - 16 /* for skb_reserve */;
+       unsigned int bufsz = 256 - 16 /* for skb_reserve */ ;
 
        i = rx_ring->next_to_use;
        buffer_info = &rx_ring->buffer_info[i];
@@ -805,7 +1107,8 @@ static void e1000_alloc_jumbo_rx_buffers(struct e1000_ring *rx_ring,
 check_page:
                /* allocate a new page if necessary */
                if (!buffer_info->page) {
-                       buffer_info->page = alloc_page(gfp);
+                       buffer_info->page = alloc_pages_node(adapter->node,
+                                                            gfp, 0);
                        if (unlikely(!buffer_info->page)) {
                                adapter->alloc_rx_buff_failed++;
                                break;
@@ -813,9 +1116,9 @@ check_page:
                }
 
                if (!buffer_info->dma)
-                       buffer_info->dma = dma_map_page(&pdev->dev,
-                                                       buffer_info->page, 0,
-                                                       PAGE_SIZE,
+                       buffer_info->dma = dma_map_page(pci_dev_to_dev(pdev),
+                                                       buffer_info->page, 0,
+                                                       PAGE_SIZE,
                                                        DMA_FROM_DEVICE);
 
                rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);
@@ -842,7 +1145,9 @@ check_page:
                        writel(i, rx_ring->tail);
        }
 }
+#endif /* CONFIG_E1000E_NAPI */
 
+#ifdef NETIF_F_RXHASH
 static inline void e1000_rx_hash(struct net_device *netdev, __le32 rss,
                                 struct sk_buff *skb)
 {
@@ -850,6 +1155,7 @@ static inline void e1000_rx_hash(struct net_device *netdev, __le32 rss,
                skb->rxhash = le32_to_cpu(rss);
 }
 
+#endif
 /**
  * e1000_clean_rx_irq - Send received data up the network stack
  * @rx_ring: Rx descriptor ring
@@ -857,8 +1163,12 @@ static inline void e1000_rx_hash(struct net_device *netdev, __le32 rss,
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
+#ifdef CONFIG_E1000E_NAPI
 static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                               int work_to_do)
+#else
+static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring)
+#endif
 {
        struct e1000_adapter *adapter = rx_ring->adapter;
        struct net_device *netdev = adapter->netdev;
@@ -880,10 +1190,12 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
        while (staterr & E1000_RXD_STAT_DD) {
                struct sk_buff *skb;
 
+#ifdef CONFIG_E1000E_NAPI
                if (*work_done >= work_to_do)
                        break;
                (*work_done)++;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
+#endif
+               rmb();          /* read descriptor and rx_buffer_info after status DD */
 
                skb = buffer_info->skb;
                buffer_info->skb = NULL;
@@ -900,10 +1212,9 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
 
                cleaned = true;
                cleaned_count++;
-               dma_unmap_single(&pdev->dev,
+               dma_unmap_single(pci_dev_to_dev(pdev),
                                 buffer_info->dma,
-                                adapter->rx_buffer_len,
-                                DMA_FROM_DEVICE);
+                                adapter->rx_buffer_len, DMA_FROM_DEVICE);
                buffer_info->dma = 0;
 
                length = le16_to_cpu(rx_desc->wb.upper.length);
@@ -928,15 +1239,24 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                        goto next_desc;
                }
 
-               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+               if (unlikely((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) &&
+                            !(netdev->features & NETIF_F_RXALL))) {
                        /* recycle */
                        buffer_info->skb = skb;
                        goto next_desc;
                }
 
                /* adjust length to remove Ethernet CRC */
-               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                       length -= 4;
+               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING)) {
+                       /* If configured to store CRC, don't subtract FCS,
+                        * but keep the FCS bytes out of the total_rx_bytes
+                        * counter
+                        */
+                       if (netdev->features & NETIF_F_RXFCS)
+                               total_rx_bytes -= 4;
+                       else
+                               length -= 4;
+               }
 
                total_rx_bytes += length;
                total_rx_packets++;
@@ -969,8 +1289,10 @@ static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                e1000_rx_checksum(adapter, staterr,
                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
 
+#ifdef NETIF_F_RXHASH
                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
+#endif
                e1000_receive_skb(adapter, netdev, skb, staterr,
                                  rx_desc->wb.upper.vlan);
 
@@ -998,6 +1320,14 @@ next_desc:
 
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
+#ifdef HAVE_NDO_GET_STATS64
+#elif defined(HAVE_NETDEV_STATS_IN_NETDEV)
+       netdev->stats.rx_bytes += total_rx_bytes;
+       netdev->stats.rx_packets += total_rx_packets;
+#else
+       adapter->net_stats.rx_bytes += total_rx_bytes;
+       adapter->net_stats.rx_packets += total_rx_packets;
+#endif
        return cleaned;
 }
 
@@ -1008,11 +1338,13 @@ static void e1000_put_txbuf(struct e1000_ring *tx_ring,
 
        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);
+                       dma_unmap_page(pci_dev_to_dev(adapter->pdev),
+                                      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);
+                       dma_unmap_single(pci_dev_to_dev(adapter->pdev),
+                                        buffer_info->dma, buffer_info->length,
+                                        DMA_TO_DEVICE);
                buffer_info->dma = 0;
        }
        if (buffer_info->skb) {
@@ -1025,8 +1357,8 @@ static void e1000_put_txbuf(struct e1000_ring *tx_ring,
 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_adapter,
+                                                    print_hang_task);
        struct net_device *netdev = adapter->netdev;
        struct e1000_ring *tx_ring = adapter->tx_ring;
        unsigned int i = tx_ring->next_to_clean;
@@ -1039,9 +1371,9 @@ static void e1000_print_hw_hang(struct work_struct *work)
        if (test_bit(__E1000_DOWN, &adapter->state))
                return;
 
-       if (!adapter->tx_hang_recheck &&
-           (adapter->flags2 & FLAG2_DMA_BURST)) {
-               /* May be block on write-back, flush and detect again
+       if (!adapter->tx_hang_recheck && (adapter->flags2 & FLAG2_DMA_BURST)) {
+               /*
+                * May be block on write-back, flush and detect again
                 * flush pending descriptor writebacks to memory
                 */
                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
@@ -1092,10 +1424,11 @@ static void e1000_print_hw_hang(struct work_struct *work)
              jiffies,
              eop_desc->upper.fields.status,
              er32(STATUS),
-             phy_status,
-             phy_1000t_status,
-             phy_ext_status,
-             pci_status);
+             phy_status, phy_1000t_status, phy_ext_status, pci_status);
+
+       /* Suggest workaround for known h/w issue */
+       if ((hw->mac.type == e1000_pchlan) && (er32(CTRL) & E1000_CTRL_TFCE))
+               e_err("Try turning off Tx pause (flow control) via ethtool\n");
 }
 
 /**
@@ -1115,6 +1448,7 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
        unsigned int i, eop;
        unsigned int count = 0;
        unsigned int total_tx_bytes = 0, total_tx_packets = 0;
+       unsigned int bytes_compl = 0, pkts_compl = 0;
 
        i = tx_ring->next_to_clean;
        eop = tx_ring->buffer_info[i].next_to_watch;
@@ -1123,7 +1457,7 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
        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 */
+               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];
@@ -1132,6 +1466,10 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
                        if (cleaned) {
                                total_tx_packets += buffer_info->segs;
                                total_tx_bytes += buffer_info->bytecount;
+                               if (buffer_info->skb) {
+                                       bytes_compl += buffer_info->skb->len;
+                                       pkts_compl++;
+                               }
                        }
 
                        e1000_put_txbuf(tx_ring, buffer_info);
@@ -1150,6 +1488,10 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
 
        tx_ring->next_to_clean = i;
 
+#ifdef CONFIG_BQL
+       netdev_completed_queue(netdev, pkts_compl, bytes_compl);
+#endif
+
 #define TX_WAKE_THRESHOLD 32
        if (count && netif_carrier_ok(netdev) &&
            e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
@@ -1181,6 +1523,14 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
        }
        adapter->total_tx_bytes += total_tx_bytes;
        adapter->total_tx_packets += total_tx_packets;
+#ifdef HAVE_NDO_GET_STATS64
+#elif defined(HAVE_NETDEV_STATS_IN_NETDEV)
+       netdev->stats.tx_bytes += total_tx_bytes;
+       netdev->stats.tx_packets += total_tx_packets;
+#else
+       adapter->net_stats.tx_bytes += total_tx_bytes;
+       adapter->net_stats.tx_packets += total_tx_packets;
+#endif
        return count < tx_ring->count;
 }
 
@@ -1191,8 +1541,12 @@ static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
+#ifdef CONFIG_E1000E_NAPI
 static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                                  int work_to_do)
+#else
+static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring)
+#endif
 {
        struct e1000_adapter *adapter = rx_ring->adapter;
        struct e1000_hw *hw = &adapter->hw;
@@ -1214,11 +1568,13 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
        buffer_info = &rx_ring->buffer_info[i];
 
        while (staterr & E1000_RXD_STAT_DD) {
+#ifdef CONFIG_E1000E_NAPI
                if (*work_done >= work_to_do)
                        break;
                (*work_done)++;
+#endif
                skb = buffer_info->skb;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
+               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);
@@ -1233,7 +1589,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
 
                cleaned = true;
                cleaned_count++;
-               dma_unmap_single(&pdev->dev, buffer_info->dma,
+               dma_unmap_single(pci_dev_to_dev(pdev), buffer_info->dma,
                                 adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
                buffer_info->dma = 0;
 
@@ -1249,7 +1605,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                        goto next_desc;
                }
 
-               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+               if (unlikely((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) &&
+                            !(netdev->features & NETIF_F_RXALL))) {
                        dev_kfree_skb_irq(skb);
                        goto next_desc;
                }
@@ -1265,6 +1622,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                /* Good Receive */
                skb_put(skb, length);
 
+#ifdef CONFIG_E1000E_NAPI
                {
                        /*
                         * this looks ugly, but it seems compiler issues make
@@ -1289,27 +1647,29 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                                 * kmap_atomic, so we can't hold the mapping
                                 * very long
                                 */
-                               dma_sync_single_for_cpu(&pdev->dev,
+                               dma_sync_single_for_cpu(pci_dev_to_dev(pdev),
                                                        ps_page->dma,
                                                        PAGE_SIZE,
                                                        DMA_FROM_DEVICE);
-                               vaddr = kmap_atomic(ps_page->page,
-                                                   KM_SKB_DATA_SOFTIRQ);
+                               vaddr = kmap_atomic(ps_page->page);
                                memcpy(skb_tail_pointer(skb), vaddr, l1);
-                               kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-                               dma_sync_single_for_device(&pdev->dev,
+                               kunmap_atomic(vaddr);
+                               dma_sync_single_for_device(pci_dev_to_dev(pdev),
                                                           ps_page->dma,
                                                           PAGE_SIZE,
                                                           DMA_FROM_DEVICE);
 
                                /* remove the CRC */
-                               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                                       l1 -= 4;
+                               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING)) {
+                                       if (!(netdev->features & NETIF_F_RXFCS))
+                                               l1 -= 4;
+                               }
 
                                skb_put(skb, l1);
                                goto copydone;
-                       } /* if */
+                       }       /* if */
                }
+#endif
 
                for (j = 0; j < PS_PAGE_BUFFERS; j++) {
                        length = le16_to_cpu(rx_desc->wb.upper.length[j]);
@@ -1317,8 +1677,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                                break;
 
                        ps_page = &buffer_info->ps_pages[j];
-                       dma_unmap_page(&pdev->dev, ps_page->dma, PAGE_SIZE,
-                                      DMA_FROM_DEVICE);
+                       dma_unmap_page(pci_dev_to_dev(pdev), 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;
@@ -1330,20 +1690,25 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                /* 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);
-
+               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING)) {
+                       if (!(netdev->features & NETIF_F_RXFCS))
+                               pskb_trim(skb, skb->len - 4);
+               }
+#ifdef CONFIG_E1000E_NAPI
 copydone:
+#endif
                total_rx_bytes += skb->len;
                total_rx_packets++;
 
                e1000_rx_checksum(adapter, staterr,
                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
 
+#ifdef NETIF_F_RXHASH
                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
+#endif
                if (rx_desc->wb.upper.header_status &
-                          cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
+                   cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
                        adapter->rx_hdr_split++;
 
                e1000_receive_skb(adapter, netdev, skb,
@@ -1374,14 +1739,23 @@ next_desc:
 
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
+#ifdef HAVE_NDO_GET_STATS64
+#elif defined(HAVE_NETDEV_STATS_IN_NETDEV)
+       netdev->stats.rx_bytes += total_rx_bytes;
+       netdev->stats.rx_packets += total_rx_packets;
+#else
+       adapter->net_stats.rx_bytes += total_rx_bytes;
+       adapter->net_stats.rx_packets += total_rx_packets;
+#endif
        return cleaned;
 }
 
+#ifdef CONFIG_E1000E_NAPI
 /**
  * e1000_consume_page - helper function
  **/
 static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
-                               u16 length)
+                              u16 length)
 {
        bi->page = NULL;
        skb->len += length;
@@ -1408,7 +1782,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
        unsigned int i;
        int cleaned_count = 0;
        bool cleaned = false;
-       unsigned int total_rx_bytes=0, total_rx_packets=0;
+       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
 
        i = rx_ring->next_to_clean;
        rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);
@@ -1421,7 +1795,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                if (*work_done >= work_to_do)
                        break;
                (*work_done)++;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
+               rmb();          /* read descriptor and rx_buffer_info after status DD */
 
                skb = buffer_info->skb;
                buffer_info->skb = NULL;
@@ -1436,15 +1810,16 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
 
                cleaned = true;
                cleaned_count++;
-               dma_unmap_page(&pdev->dev, buffer_info->dma, PAGE_SIZE,
-                              DMA_FROM_DEVICE);
+               dma_unmap_page(pci_dev_to_dev(pdev), buffer_info->dma,
+                              PAGE_SIZE, DMA_FROM_DEVICE);
                buffer_info->dma = 0;
 
                length = le16_to_cpu(rx_desc->wb.upper.length);
 
                /* errors is only valid for DD + EOP descriptors */
                if (unlikely((staterr & E1000_RXD_STAT_EOP) &&
-                            (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK))) {
+                            ((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) &&
+                             !(netdev->features & NETIF_F_RXALL)))) {
                        /* recycle both page and skb */
                        buffer_info->skb = skb;
                        /* an error means any chain goes out the window too */
@@ -1453,7 +1828,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                        rx_ring->rx_skb_top = NULL;
                        goto next_desc;
                }
-
 #define rxtop (rx_ring->rx_skb_top)
                if (!(staterr & E1000_RXD_STAT_EOP)) {
                        /* this descriptor is only the beginning (or middle) */
@@ -1461,12 +1835,13 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                /* this is the beginning of a chain */
                                rxtop = skb;
                                skb_fill_page_desc(rxtop, 0, buffer_info->page,
-                                                  0, length);
+                                                  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);
+                                                  skb_shinfo(rxtop)->nr_frags,
+                                                  buffer_info->page, 0,
+                                                  length);
                                /* re-use the skb, only consumed the page */
                                buffer_info->skb = skb;
                        }
@@ -1476,8 +1851,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                        if (rxtop) {
                                /* end of the chain */
                                skb_fill_page_desc(rxtop,
-                                   skb_shinfo(rxtop)->nr_frags,
-                                   buffer_info->page, 0, length);
+                                                  skb_shinfo(rxtop)->nr_frags,
+                                                  buffer_info->page, 0,
+                                                  length);
                                /* re-use the current skb, we only consumed the
                                 * page */
                                buffer_info->skb = skb;
@@ -1490,21 +1866,19 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                if (length <= copybreak &&
                                    skb_tailroom(skb) >= length) {
                                        u8 *vaddr;
-                                       vaddr = kmap_atomic(buffer_info->page,
-                                                          KM_SKB_DATA_SOFTIRQ);
+                                       vaddr = kmap_atomic(buffer_info->page);
                                        memcpy(skb_tail_pointer(skb), vaddr,
                                               length);
-                                       kunmap_atomic(vaddr,
-                                                     KM_SKB_DATA_SOFTIRQ);
+                                       kunmap_atomic(vaddr);
                                        /* 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);
+                                                          buffer_info->page, 0,
+                                                          length);
                                        e1000_consume_page(buffer_info, skb,
-                                                          length);
+                                                          length);
                                }
                        }
                }
@@ -1513,8 +1887,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                e1000_rx_checksum(adapter, staterr,
                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
 
+#ifdef NETIF_F_RXHASH
                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
+#endif
                /* probably a little skewed due to removing CRC */
                total_rx_bytes += skb->len;
                total_rx_packets++;
@@ -1553,9 +1929,18 @@ next_desc:
 
        adapter->total_rx_bytes += total_rx_bytes;
        adapter->total_rx_packets += total_rx_packets;
+#ifdef HAVE_NDO_GET_STATS64
+#elif defined(HAVE_NETDEV_STATS_IN_NETDEV)
+       netdev->stats.rx_bytes += total_rx_bytes;
+       netdev->stats.rx_packets += total_rx_packets;
+#else
+       adapter->net_stats.rx_bytes += total_rx_bytes;
+       adapter->net_stats.rx_packets += total_rx_packets;
+#endif
        return cleaned;
 }
 
+#endif /* CONFIG_E1000E_NAPI */
 /**
  * e1000_clean_rx_ring - Free Rx Buffers per Queue
  * @rx_ring: Rx descriptor ring
@@ -1573,15 +1958,19 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
                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,
+                               dma_unmap_single(pci_dev_to_dev(pdev),
+                                                buffer_info->dma,
                                                 adapter->rx_buffer_len,
                                                 DMA_FROM_DEVICE);
+#ifdef CONFIG_E1000E_NAPI
                        else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)
-                               dma_unmap_page(&pdev->dev, buffer_info->dma,
-                                              PAGE_SIZE,
+                               dma_unmap_page(pci_dev_to_dev(pdev),
+                                              buffer_info->dma, PAGE_SIZE,
                                               DMA_FROM_DEVICE);
+#endif
                        else if (adapter->clean_rx == e1000_clean_rx_irq_ps)
-                               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                               dma_unmap_single(pci_dev_to_dev(pdev),
+                                                buffer_info->dma,
                                                 adapter->rx_ps_bsize0,
                                                 DMA_FROM_DEVICE);
                        buffer_info->dma = 0;
@@ -1601,19 +1990,21 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
                        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);
+                       dma_unmap_page(pci_dev_to_dev(pdev), ps_page->dma,
+                                      PAGE_SIZE, DMA_FROM_DEVICE);
                        ps_page->dma = 0;
                        put_page(ps_page->page);
                        ps_page->page = NULL;
                }
        }
 
+#ifdef CONFIG_E1000E_NAPI
        /* 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;
        }
+#endif
 
        /* Zero out the descriptor ring */
        memset(rx_ring->desc, 0, rx_ring->size);
@@ -1623,13 +2014,17 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
        adapter->flags2 &= ~FLAG2_IS_DISCARDING;
 
        writel(0, rx_ring->head);
-       writel(0, rx_ring->tail);
+       if (rx_ring->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+               e1000e_update_rdt_wa(rx_ring, 0);
+       else
+               writel(0, rx_ring->tail);
 }
 
 static void e1000e_downshift_workaround(struct work_struct *work)
 {
        struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, downshift_task);
+                                                    struct e1000_adapter,
+                                                    downshift_task);
 
        if (test_bit(__E1000_DOWN, &adapter->state))
                return;
@@ -1637,6 +2032,9 @@ static void e1000e_downshift_workaround(struct work_struct *work)
        e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
 }
 
+#ifndef CONFIG_E1000E_NAPI
+static void e1000_set_itr(struct e1000_adapter *adapter);
+#endif
 /**
  * e1000_intr_msi - Interrupt Handler
  * @irq: interrupt number
@@ -1647,6 +2045,9 @@ 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;
+#ifndef CONFIG_E1000E_NAPI
+       int i;
+#endif
        u32 icr = er32(ICR);
 
        /*
@@ -1679,7 +2080,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
                if (!test_bit(__E1000_DOWN, &adapter->state))
                        mod_timer(&adapter->watchdog_timer, jiffies + 1);
        }
-
+#ifdef CONFIG_E1000E_NAPI
        if (napi_schedule_prep(&adapter->napi)) {
                adapter->total_tx_bytes = 0;
                adapter->total_tx_packets = 0;
@@ -1687,6 +2088,22 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
                adapter->total_rx_packets = 0;
                __napi_schedule(&adapter->napi);
        }
+#else
+       adapter->total_tx_bytes = 0;
+       adapter->total_rx_bytes = 0;
+       adapter->total_tx_packets = 0;
+       adapter->total_rx_packets = 0;
+
+       for (i = 0; i < E1000_MAX_INTR; i++) {
+               int rx_cleaned = adapter->clean_rx(adapter->rx_ring);
+               int tx_cleaned_complete = e1000_clean_tx_irq(adapter->tx_ring);
+               if (!rx_cleaned && tx_cleaned_complete)
+                       break;
+       }
+
+       if (likely(adapter->itr_setting & 3))
+               e1000_set_itr(adapter);
+#endif /* CONFIG_E1000E_NAPI */
 
        return IRQ_HANDLED;
 }
@@ -1701,11 +2118,16 @@ 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;
+#ifndef CONFIG_E1000E_NAPI
+       int i;
+       int rx_cleaned, tx_cleaned_complete;
+#endif
        u32 rctl, icr = er32(ICR);
 
        if (!icr || test_bit(__E1000_DOWN, &adapter->state))
-               return IRQ_NONE;  /* Not our interrupt */
+               return IRQ_NONE;        /* Not our interrupt */
 
+#ifdef CONFIG_E1000E_NAPI
        /*
         * 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
@@ -1713,6 +2135,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
        if (!(icr & E1000_ICR_INT_ASSERTED))
                return IRQ_NONE;
 
+#endif /* CONFIG_E1000E_NAPI */
        /*
         * Interrupt Auto-Mask...upon reading ICR,
         * interrupts are masked.  No need for the
@@ -1746,7 +2169,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
                if (!test_bit(__E1000_DOWN, &adapter->state))
                        mod_timer(&adapter->watchdog_timer, jiffies + 1);
        }
-
+#ifdef CONFIG_E1000E_NAPI
        if (napi_schedule_prep(&adapter->napi)) {
                adapter->total_tx_bytes = 0;
                adapter->total_tx_packets = 0;
@@ -1754,6 +2177,22 @@ static irqreturn_t e1000_intr(int irq, void *data)
                adapter->total_rx_packets = 0;
                __napi_schedule(&adapter->napi);
        }
+#else
+       adapter->total_tx_bytes = 0;
+       adapter->total_rx_bytes = 0;
+       adapter->total_tx_packets = 0;
+       adapter->total_rx_packets = 0;
+
+       for (i = 0; i < E1000_MAX_INTR; i++) {
+               rx_cleaned = adapter->clean_rx(adapter->rx_ring);
+               tx_cleaned_complete = e1000_clean_tx_irq(adapter->tx_ring);
+               if (!rx_cleaned && tx_cleaned_complete)
+                       break;
+       }
+
+       if (likely(adapter->itr_setting & 3))
+               e1000_set_itr(adapter);
+#endif /* CONFIG_E1000E_NAPI */
 
        return IRQ_HANDLED;
 }
@@ -1790,7 +2229,6 @@ no_link_interrupt:
        return IRQ_HANDLED;
 }
 
-
 static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
 {
        struct net_device *netdev = data;
@@ -1798,7 +2236,6 @@ static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
        struct e1000_hw *hw = &adapter->hw;
        struct e1000_ring *tx_ring = adapter->tx_ring;
 
-
        adapter->total_tx_bytes = 0;
        adapter->total_tx_packets = 0;
 
@@ -1814,6 +2251,10 @@ static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
        struct net_device *netdev = data;
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct e1000_ring *rx_ring = adapter->rx_ring;
+#ifndef CONFIG_E1000E_NAPI
+       int i;
+       struct e1000_hw *hw = &adapter->hw;
+#endif
 
        /* Write the ITR value calculated at the end of the
         * previous interrupt.
@@ -1823,12 +2264,28 @@ static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
                       rx_ring->itr_register);
                rx_ring->set_itr = 0;
        }
-
+#ifdef CONFIG_E1000E_NAPI
        if (napi_schedule_prep(&adapter->napi)) {
                adapter->total_rx_bytes = 0;
                adapter->total_rx_packets = 0;
                __napi_schedule(&adapter->napi);
        }
+#else
+       adapter->total_rx_bytes = 0;
+       adapter->total_rx_packets = 0;
+
+       for (i = 0; i < E1000_MAX_INTR; i++) {
+               int rx_cleaned = adapter->clean_rx(rx_ring);
+               if (!rx_cleaned)
+                       goto out;
+       }
+       /* If we got here, the ring was not completely cleaned,
+        * so fire another interrupt.
+        */
+       ew32(ICS, rx_ring->ims_val);
+
+out:
+#endif /* CONFIG_E1000E_NAPI */
        return IRQ_HANDLED;
 }
 
@@ -1854,7 +2311,6 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
                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;
@@ -1896,7 +2352,6 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
        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);
@@ -1929,10 +2384,11 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
        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);
+                       adapter->num_vectors = 3;       /* RxQ0, TxQ0 and other */
+                       adapter->msix_entries =
+                           kzalloc_node(adapter->num_vectors *
+                                        sizeof(struct msix_entry), GFP_KERNEL,
+                                        adapter->node);
                        if (adapter->msix_entries) {
                                for (i = 0; i < adapter->num_vectors; i++)
                                        adapter->msix_entries[i].entry = i;
@@ -2174,13 +2630,24 @@ static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
                                struct e1000_ring *ring)
 {
        struct pci_dev *pdev = adapter->pdev;
+       int old_node = dev_to_node(pci_dev_to_dev(pdev));
+       int retval = 0;
 
-       ring->desc = dma_alloc_coherent(&pdev->dev, ring->size, &ring->dma,
-                                       GFP_KERNEL);
+       /*
+        * must use set_dev_node here to work around the lack of a
+        * dma_alloc_coherent_node function call
+        */
+       if (adapter->node != -1)
+               set_dev_node(pci_dev_to_dev(pdev), adapter->node);
+       ring->desc =
+           dma_alloc_coherent(pci_dev_to_dev(pdev), ring->size, &ring->dma,
+                              GFP_KERNEL);
        if (!ring->desc)
-               return -ENOMEM;
+               retval = -ENOMEM;
 
-       return 0;
+       if (adapter->node != -1)
+               set_dev_node(pci_dev_to_dev(pdev), old_node);
+       return retval;
 }
 
 /**
@@ -2195,7 +2662,7 @@ int e1000e_setup_tx_resources(struct e1000_ring *tx_ring)
        int err = -ENOMEM, size;
 
        size = sizeof(struct e1000_buffer) * tx_ring->count;
-       tx_ring->buffer_info = vzalloc(size);
+       tx_ring->buffer_info = vzalloc_node(size, adapter->node);
        if (!tx_ring->buffer_info)
                goto err;
 
@@ -2230,15 +2697,16 @@ int e1000e_setup_rx_resources(struct e1000_ring *rx_ring)
        int i, size, desc_len, err = -ENOMEM;
 
        size = sizeof(struct e1000_buffer) * rx_ring->count;
-       rx_ring->buffer_info = vzalloc(size);
+       rx_ring->buffer_info = vzalloc_node(size, adapter->node);
        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);
+               buffer_info->ps_pages = kzalloc_node(PS_PAGE_BUFFERS *
+                                                    sizeof(struct
+                                                           e1000_ps_page),
+                                                    GFP_KERNEL, adapter->node);
                if (!buffer_info->ps_pages)
                        goto err_pages;
        }
@@ -2276,7 +2744,9 @@ err:
  **/
 static void e1000_clean_tx_ring(struct e1000_ring *tx_ring)
 {
+#ifdef CONFIG_BQL
        struct e1000_adapter *adapter = tx_ring->adapter;
+#endif
        struct e1000_buffer *buffer_info;
        unsigned long size;
        unsigned int i;
@@ -2286,6 +2756,9 @@ static void e1000_clean_tx_ring(struct e1000_ring *tx_ring)
                e1000_put_txbuf(tx_ring, buffer_info);
        }
 
+#ifdef CONFIG_BQL
+       netdev_reset_queue(adapter->netdev);
+#endif
        size = sizeof(struct e1000_buffer) * tx_ring->count;
        memset(tx_ring->buffer_info, 0, size);
 
@@ -2295,7 +2768,10 @@ static void e1000_clean_tx_ring(struct e1000_ring *tx_ring)
        tx_ring->next_to_clean = 0;
 
        writel(0, tx_ring->head);
-       writel(0, tx_ring->tail);
+       if (tx_ring->adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
+               e1000e_update_tdt_wa(tx_ring, 0);
+       else
+               writel(0, tx_ring->tail);
 }
 
 /**
@@ -2314,7 +2790,7 @@ void e1000e_free_tx_resources(struct e1000_ring *tx_ring)
        vfree(tx_ring->buffer_info);
        tx_ring->buffer_info = NULL;
 
-       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+       dma_free_coherent(pci_dev_to_dev(pdev), tx_ring->size, tx_ring->desc,
                          tx_ring->dma);
        tx_ring->desc = NULL;
 }
@@ -2339,7 +2815,7 @@ void e1000e_free_rx_resources(struct e1000_ring *rx_ring)
        vfree(rx_ring->buffer_info);
        rx_ring->buffer_info = NULL;
 
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+       dma_free_coherent(pci_dev_to_dev(pdev), rx_ring->size, rx_ring->desc,
                          rx_ring->dma);
        rx_ring->desc = NULL;
 }
@@ -2361,8 +2837,7 @@ void e1000e_free_rx_resources(struct e1000_ring *rx_ring)
  *      by the InterruptThrottleRate module parameter.
  **/
 static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
-                                    u16 itr_setting, int packets,
-                                    int bytes)
+                                    u16 itr_setting, int packets, int bytes)
 {
        unsigned int retval = itr_setting;
 
@@ -2372,27 +2847,27 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
        switch (itr_setting) {
        case lowest_latency:
                /* handle TSO and jumbo frames */
-               if (bytes/packets > 8000)
+               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 */
+       case low_latency:       /* 50 usec aka 20000 ints/s */
                if (bytes > 10000) {
                        /* this if handles the TSO accounting */
-                       if (bytes/packets > 8000)
+                       if (bytes / packets > 8000)
                                retval = bulk_latency;
-                       else if ((packets < 10) || ((bytes/packets) > 1200))
+                       else if ((packets < 10) || ((bytes / packets) > 1200))
                                retval = bulk_latency;
                        else if ((packets > 35))
                                retval = lowest_latency;
-               } else if (bytes/packets > 2000) {
+               } 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 */
+       case bulk_latency:      /* 250 usec aka 4000 ints/s */
                if (bytes > 25000) {
                        if (packets > 35)
                                retval = low_latency;
@@ -2424,17 +2899,17 @@ static void e1000_set_itr(struct e1000_adapter *adapter)
        }
 
        adapter->tx_itr = e1000_update_itr(adapter,
-                                   adapter->tx_itr,
-                                   adapter->total_tx_packets,
-                                   adapter->total_tx_bytes);
+                                          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);
+                                          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;
@@ -2442,12 +2917,12 @@ static void e1000_set_itr(struct e1000_adapter *adapter)
        current_itr = max(adapter->rx_itr, adapter->tx_itr);
 
        switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
+               /* 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 */
+               new_itr = 20000;        /* aka hwitr = ~200 */
                break;
        case bulk_latency:
                new_itr = 4000;
@@ -2464,17 +2939,15 @@ set_itr_now:
                 * increasing
                 */
                new_itr = new_itr > adapter->itr ?
-                            min(adapter->itr + (new_itr >> 2), new_itr) :
-                            new_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
-                       if (new_itr)
-                               ew32(ITR, 1000000000 / (new_itr * 256));
-                       else
-                               ew32(ITR, 0);
+                       ew32(ITR, 0);
        }
 }
 
@@ -2486,13 +2959,13 @@ static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
 {
        int size = sizeof(struct e1000_ring);
 
-       adapter->tx_ring = kzalloc(size, GFP_KERNEL);
+       adapter->tx_ring = kzalloc_node(size, GFP_KERNEL, adapter->node);
        if (!adapter->tx_ring)
                goto err;
        adapter->tx_ring->count = adapter->tx_ring_count;
        adapter->tx_ring->adapter = adapter;
 
-       adapter->rx_ring = kzalloc(size, GFP_KERNEL);
+       adapter->rx_ring = kzalloc_node(size, GFP_KERNEL, adapter->node);
        if (!adapter->rx_ring)
                goto err;
        adapter->rx_ring->count = adapter->rx_ring_count;
@@ -2506,34 +2979,39 @@ err:
        return -ENOMEM;
 }
 
+#ifdef CONFIG_E1000E_NAPI
 /**
- * e1000_clean - NAPI Rx polling callback
+ * e1000e_poll - NAPI Rx polling callback
  * @napi: struct associated with this polling callback
- * @budget: amount of packets driver is allowed to process this poll
+ * @weight: number of packets driver is allowed to process this poll
  **/
-static int e1000_clean(struct napi_struct *napi, int budget)
+static int e1000e_poll(struct napi_struct *napi, int weight)
 {
-       struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
+       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;
+       if (!adapter->msix_entries ||
+           (adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
+               tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);
 
-       tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);
-
-clean_rx:
-       adapter->clean_rx(adapter->rx_ring, &work_done, budget);
+       adapter->clean_rx(adapter->rx_ring, &work_done, weight);
 
        if (!tx_cleaned)
-               work_done = budget;
+               work_done = weight;
+
+#ifndef HAVE_NETDEV_NAPI_LIST
+       /* if netdev is disabled we need to stop polling */
+       if (!netif_running(adapter->netdev))
+               work_done = 0;
 
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
+#endif
+       /* If weight not fully consumed, exit the polling mode */
+       if (work_done < weight) {
                if (adapter->itr_setting & 3)
                        e1000_set_itr(adapter);
                napi_complete(napi);
@@ -2548,7 +3026,13 @@ clean_rx:
        return work_done;
 }
 
+#endif /* CONFIG_E1000E_NAPI */
+#ifdef NETIF_F_HW_VLAN_TX
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+#else
 static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+#endif
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct e1000_hw *hw = &adapter->hw;
@@ -2558,7 +3042,11 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
        if ((adapter->hw.mng_cookie.status &
             E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
            (vid == adapter->mng_vlan_id))
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+               return 0;
+#else
                return;
+#endif
 
        /* add VID to filter table */
        if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
@@ -2567,22 +3055,61 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
                vfta |= (1 << (vid & 0x1F));
                hw->mac.ops.write_vfta(hw, index, vfta);
        }
+#ifndef HAVE_NETDEV_VLAN_FEATURES
+
+       /*
+        * Copy feature flags from netdev to the vlan netdev for this vid.
+        * This allows things like TSO to bubble down to our vlan device.
+        */
+       if (adapter->vlgrp) {
+               struct vlan_group *vlgrp = adapter->vlgrp;
+               struct net_device *v_netdev = vlan_group_get_device(vlgrp, vid);
+               if (v_netdev) {
+                       v_netdev->features |= netdev->features;
+                       vlan_group_set_device(vlgrp, vid, v_netdev);
+               }
+       }
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
+#ifndef HAVE_VLAN_RX_REGISTER
 
        set_bit(vid, adapter->active_vlans);
+#endif /* !HAVE_NETDEV_VLAN_RX_REGISTER */
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+
+       return 0;
+#endif
 }
 
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+#else
 static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+#endif
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct e1000_hw *hw = &adapter->hw;
        u32 vfta, index;
 
+#ifdef HAVE_VLAN_RX_REGISTER
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               e1000_irq_disable(adapter);
+
+       vlan_group_set_device(adapter->vlgrp, vid, NULL);
+
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               e1000_irq_enable(adapter);
+
+#endif /* HAVE_VLAN_RX_REGISTER */
        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);
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+               return 0;
+#else
                return;
+#endif
        }
 
        /* remove VID from filter table */
@@ -2592,10 +3119,17 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
                vfta &= ~(1 << (vid & 0x1F));
                hw->mac.ops.write_vfta(hw, index, vfta);
        }
+#ifndef HAVE_VLAN_RX_REGISTER
 
        clear_bit(vid, adapter->active_vlans);
+#endif /* !HAVE_VLAN_RX_REGISTER */
+#ifdef HAVE_INT_NDO_VLAN_RX_ADD_VID
+
+       return 0;
+#endif
 }
 
+#ifndef HAVE_VLAN_RX_REGISTER
 /**
  * e1000e_vlan_filter_disable - helper to disable hw VLAN filtering
  * @adapter: board private structure to initialize
@@ -2666,6 +3200,7 @@ static void e1000e_vlan_strip_enable(struct e1000_adapter *adapter)
        ctrl |= E1000_CTRL_VME;
        ew32(CTRL, ctrl);
 }
+#endif /* !HAVE_VLAN_RX_REGISTER */
 
 static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
 {
@@ -2673,26 +3208,105 @@ static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
        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) {
+#ifdef HAVE_VLAN_RX_REGISTER
+       if (!adapter->vlgrp)
+               return;
+
+       if (!vlan_group_get_device(adapter->vlgrp, vid)) {
+               adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
+               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) &&
+                   !vlan_group_get_device(adapter->vlgrp, old_vid))
+                       e1000_vlan_rx_kill_vid(netdev, old_vid);
+       } else {
+               adapter->mng_vlan_id = vid;
+       }
+#else /* HAVE_VLAN_RX_REGISTER */
+       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);
+#endif /* HAVE_VLAN_RX_REGISTER */
+}
+
+#ifdef HAVE_VLAN_RX_REGISTER
+static void e1000_vlan_rx_register(struct net_device *netdev,
+                                  struct vlan_group *grp)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl, rctl;
+
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               e1000_irq_disable(adapter);
+       adapter->vlgrp = grp;
+
+       if (grp) {
+               /* enable VLAN tag insert/strip */
+               ctrl = er32(CTRL);
+               ctrl |= E1000_CTRL_VME;
+               ew32(CTRL, ctrl);
+
+               if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+                       /* enable VLAN receive filtering */
+                       rctl = er32(RCTL);
+                       rctl &= ~E1000_RCTL_CFIEN;
+                       ew32(RCTL, rctl);
+                       e1000_update_mng_vlan(adapter);
+               }
+       } else {
+               /* disable VLAN tag insert/strip */
+               ctrl = er32(CTRL);
+               ctrl &= ~E1000_CTRL_VME;
+               ew32(CTRL, ctrl);
+
+               if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+                       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;
+                       }
+               }
+       }
+
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               e1000_irq_enable(adapter);
 }
 
+#endif /* HAVE_VLAN_RX_REGISTER */
 static void e1000_restore_vlan(struct e1000_adapter *adapter)
 {
        u16 vid;
 
+#ifdef HAVE_VLAN_RX_REGISTER
+       e1000_vlan_rx_register(adapter->netdev, adapter->vlgrp);
+
+       if (!adapter->vlgrp)
+               return;
+
+       for (vid = 0; vid < VLAN_N_VID; vid++) {
+               if (!vlan_group_get_device(adapter->vlgrp, vid))
+                       continue;
+               e1000_vlan_rx_add_vid(adapter->netdev, vid);
+       }
+#else /* HAVE_VLAN_RX_REGISTER */
        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);
+           e1000_vlan_rx_add_vid(adapter->netdev, vid);
+#endif /* HAVE_VLAN_RX_REGISTER */
 }
 
+#endif /* NETIF_F_HW_VLAN_TX */
 static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
@@ -2773,13 +3387,13 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
        /* 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 = adapter->hw.hw_addr + E1000_TDH;
-       tx_ring->tail = adapter->hw.hw_addr + E1000_TDT;
+       ew32(TDBAL(0), (tdba & DMA_BIT_MASK(32)));
+       ew32(TDBAH(0), (tdba >> 32));
+       ew32(TDLEN(0), tdlen);
+       ew32(TDH(0), 0);
+       ew32(TDT(0), 0);
+       tx_ring->head = adapter->hw.hw_addr + E1000_TDH(0);
+       tx_ring->tail = adapter->hw.hw_addr + E1000_TDT(0);
 
        /* Set the Tx Interrupt Delay register */
        ew32(TIDV, adapter->tx_int_delay);
@@ -2837,7 +3451,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
        /* enable Report Status bit */
        adapter->txd_cmd |= E1000_TXD_CMD_RS;
 
-       e1000e_config_collision_dist(hw);
+       hw->mac.ops.config_collision_dist(hw);
 }
 
 /**
@@ -2852,8 +3466,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        u32 rctl, rfctl;
        u32 pages = 0;
 
-       /* Workaround Si errata on 82579 - configure jumbo frame flow */
-       if (hw->mac.type == e1000_pch2lan) {
+       /* Workaround Si errata on PCHx - configure jumbo frame flow */
+       if (hw->mac.type >= e1000_pch2lan) {
                s32 ret_val;
 
                if (adapter->netdev->mtu > ETH_DATA_LEN)
@@ -2869,8 +3483,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        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);
+           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;
@@ -2888,8 +3502,9 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        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)) {
+       /* Workaround Si errata on 82577/82578 - configure IPG for jumbos */
+       if ((hw->mac.type == e1000_pchlan) && (rctl & E1000_RCTL_LPE)) {
+               u32 mac_data;
                u16 phy_data;
 
                e1e_rphy(hw, PHY_REG(770, 26), &phy_data);
@@ -2897,12 +3512,18 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                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);
+               mac_data = er32(FFLT_DBG);
+               mac_data |= (1 << 17);
+               ew32(FFLT_DBG, mac_data);
+
+               if (hw->phy.type == e1000_phy_82577) {
+                       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 */
@@ -2928,6 +3549,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        /* Enable Extended Status in all Receive Descriptors */
        rfctl = er32(RFCTL);
        rfctl |= E1000_RFCTL_EXTEN;
+       ew32(RFCTL, rfctl);
 
        /*
         * 82571 and greater support packet-split where the protocol
@@ -2953,36 +3575,40 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        if (adapter->rx_ps_pages) {
                u32 psrctl = 0;
 
-               /*
-                * 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);
-
                /* Enable Packet split descriptors */
                rctl |= E1000_RCTL_DTYP_PS;
 
-               psrctl |= adapter->rx_ps_bsize0 >>
-                       E1000_PSRCTL_BSIZE0_SHIFT;
+               psrctl |= adapter->rx_ps_bsize0 >> E1000_PSRCTL_BSIZE0_SHIFT;
 
                switch (adapter->rx_ps_pages) {
                case 3:
-                       psrctl |= PAGE_SIZE <<
-                               E1000_PSRCTL_BSIZE3_SHIFT;
+                       psrctl |= PAGE_SIZE << E1000_PSRCTL_BSIZE3_SHIFT;
                case 2:
-                       psrctl |= PAGE_SIZE <<
-                               E1000_PSRCTL_BSIZE2_SHIFT;
+                       psrctl |= PAGE_SIZE << E1000_PSRCTL_BSIZE2_SHIFT;
                case 1:
-                       psrctl |= PAGE_SIZE >>
-                               E1000_PSRCTL_BSIZE1_SHIFT;
+                       psrctl |= PAGE_SIZE >> E1000_PSRCTL_BSIZE1_SHIFT;
                        break;
                }
 
                ew32(PSRCTL, psrctl);
        }
 
-       ew32(RFCTL, rfctl);
+       /* This is useful for sniffing bad packets. */
+       if (adapter->netdev->features & NETIF_F_RXALL) {
+               /* UPE and MPE will be handled by normal PROMISC logic
+                * in e1000e_set_rx_mode */
+               rctl |= (E1000_RCTL_SBP |       /* Receive bad packets */
+                        E1000_RCTL_BAM |       /* RX All Bcast Pkts */
+                        E1000_RCTL_PMCF);      /* RX All MAC Ctrl Pkts */
+
+               rctl &= ~(E1000_RCTL_VFE |      /* Disable VLAN filter */
+                         E1000_RCTL_DPF |      /* Allow filtered pause */
+                         E1000_RCTL_CFIEN);    /* Dis VLAN CFIEN Filter */
+               /* Do not mess with E1000_CTRL_VME, it affects transmit as well,
+                * and that breaks VLANs.
+                */
+       }
+
        ew32(RCTL, rctl);
        /* just started the receive unit, no need to restart */
        adapter->flags &= ~FLAG_RX_RESTART_NOW;
@@ -3007,10 +3633,12 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                    sizeof(union e1000_rx_desc_packet_split);
                adapter->clean_rx = e1000_clean_rx_irq_ps;
                adapter->alloc_rx_buf = e1000_alloc_rx_buffers_ps;
+#ifdef CONFIG_E1000E_NAPI
        } else if (adapter->netdev->mtu > ETH_FRAME_LEN + ETH_FCS_LEN) {
                rdlen = rx_ring->count * sizeof(union e1000_rx_desc_extended);
                adapter->clean_rx = e1000_clean_jumbo_rx_irq;
                adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;
+#endif
        } else {
                rdlen = rx_ring->count * sizeof(union e1000_rx_desc_extended);
                adapter->clean_rx = e1000_clean_rx_irq;
@@ -3056,9 +3684,11 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                ew32(ITR, 1000000000 / (adapter->itr * 256));
 
        ctrl_ext = er32(CTRL_EXT);
+#ifdef CONFIG_E1000E_NAPI
        /* Auto-Mask interrupts upon ICR access */
        ctrl_ext |= E1000_CTRL_EXT_IAME;
        ew32(IAM, 0xffffffff);
+#endif
        ew32(CTRL_EXT, ctrl_ext);
        e1e_flush();
 
@@ -3067,17 +3697,21 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         * 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 = adapter->hw.hw_addr + E1000_RDH;
-       rx_ring->tail = adapter->hw.hw_addr + E1000_RDT;
+       ew32(RDBAL(0), (rdba & DMA_BIT_MASK(32)));
+       ew32(RDBAH(0), (rdba >> 32));
+       ew32(RDLEN(0), rdlen);
+       ew32(RDH(0), 0);
+       ew32(RDT(0), 0);
+       rx_ring->head = adapter->hw.hw_addr + E1000_RDH(0);
+       rx_ring->tail = adapter->hw.hw_addr + E1000_RDT(0);
 
        /* Enable Receive Checksum Offload for TCP and UDP */
        rxcsum = er32(RXCSUM);
+#ifdef HAVE_NDO_SET_FEATURES
        if (adapter->netdev->features & NETIF_F_RXCSUM) {
+#else
+       if (adapter->flags & FLAG_RX_CSUM_ENABLED) {
+#endif
                rxcsum |= E1000_RXCSUM_TUOFL;
 
                /*
@@ -3100,10 +3734,26 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                if (adapter->netdev->mtu > ETH_DATA_LEN) {
                        u32 rxdctl = er32(RXDCTL(0));
                        ew32(RXDCTL(0), rxdctl | 0x3);
+#ifdef HAVE_PM_QOS_REQUEST_ACTIVE
                        pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);
+#elif defined(HAVE_PM_QOS_REQUEST_LIST)
+                       pm_qos_update_request(adapter->netdev->pm_qos_req, 55);
+#else
+                       pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY,
+                                                 adapter->netdev->name, 55);
+#endif
                } else {
+#ifdef HAVE_PM_QOS_REQUEST_ACTIVE
                        pm_qos_update_request(&adapter->netdev->pm_qos_req,
                                              PM_QOS_DEFAULT_VALUE);
+#elif defined(HAVE_PM_QOS_REQUEST_LIST)
+                       pm_qos_update_request(adapter->netdev->pm_qos_req,
+                                             PM_QOS_DEFAULT_VALUE);
+#else
+                       pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY,
+                                                 adapter->netdev->name,
+                                                 PM_QOS_DEFAULT_VALUE);
+#endif
                }
        }
 
@@ -3124,7 +3774,11 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct e1000_hw *hw = &adapter->hw;
+#ifdef NETDEV_HW_ADDR_T_MULTICAST
        struct netdev_hw_addr *ha;
+#else
+       struct dev_mc_list *ha;
+#endif
        u8 *mta_list;
        int i;
 
@@ -3141,7 +3795,11 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
        /* update_mc_addr_list 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);
+#ifdef NETDEV_HW_ADDR_T_MULTICAST
+           memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+#else
+           memcpy(mta_list + (i++ * ETH_ALEN), ha->dmi_addr, ETH_ALEN);
+#endif
 
        hw->mac.ops.update_mc_addr_list(hw, mta_list, i);
        kfree(mta_list);
@@ -3149,6 +3807,7 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
        return netdev_mc_count(netdev);
 }
 
+#ifdef HAVE_SET_RX_MODE
 /**
  * e1000e_write_uc_addr_list - write unicast addresses to RAR table
  * @netdev: network interface device structure
@@ -3177,7 +3836,11 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
                return -ENOMEM;
 
        if (!netdev_uc_empty(netdev) && rar_entries) {
+#ifdef NETDEV_HW_ADDR_T_UNICAST
                struct netdev_hw_addr *ha;
+#else
+               struct dev_mc_list *ha;
+#endif
 
                /*
                 * write the addresses in reverse order to avoid write
@@ -3186,7 +3849,11 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
                netdev_for_each_uc_addr(ha, netdev) {
                        if (!rar_entries)
                                break;
+#ifdef NETDEV_HW_ADDR_T_UNICAST
                        e1000e_rar_set(hw, ha->addr, rar_entries--);
+#else
+                       e1000e_rar_set(hw, ha->da_addr, rar_entries--);
+#endif
                        count++;
                }
        }
@@ -3201,6 +3868,7 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
        return count;
 }
 
+#endif /* HAVE_SET_RX_MODE */
 /**
  * e1000e_set_rx_mode - secondary unicast, Multicast and Promiscuous mode set
  * @netdev: network interface device structure
@@ -3224,10 +3892,15 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
 
        if (netdev->flags & IFF_PROMISC) {
                rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
+#ifdef HAVE_VLAN_RX_REGISTER
+               rctl &= ~E1000_RCTL_VFE;
+#else
                /* Do not hardware filter VLANs in promisc mode */
                e1000e_vlan_filter_disable(adapter);
+#endif /* HAVE_VLAN_RX_REGISTER */
        } else {
                int count;
+
                if (netdev->flags & IFF_ALLMULTI) {
                        rctl |= E1000_RCTL_MPE;
                } else {
@@ -3240,7 +3913,13 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
                        if (count < 0)
                                rctl |= E1000_RCTL_MPE;
                }
+#ifdef HAVE_VLAN_RX_REGISTER
+               if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
+                       rctl |= E1000_RCTL_VFE;
+#else
                e1000e_vlan_filter_enable(adapter);
+#endif
+#ifdef HAVE_SET_RX_MODE
                /*
                 * Write addresses to available RAR registers, if there is not
                 * sufficient space to store all the addresses then enable
@@ -3249,16 +3928,20 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
                count = e1000e_write_uc_addr_list(netdev);
                if (count < 0)
                        rctl |= E1000_RCTL_UPE;
+#endif /* HAVE_SET_RX_MODE */
        }
 
        ew32(RCTL, rctl);
+#ifndef HAVE_VLAN_RX_REGISTER
 
        if (netdev->features & NETIF_F_HW_VLAN_RX)
                e1000e_vlan_strip_enable(adapter);
        else
                e1000e_vlan_strip_disable(adapter);
+#endif /* HAVE_VLAN_RX_REGISTER */
 }
 
+#ifdef NETIF_F_RXHASH
 static void e1000e_setup_rss_hash(struct e1000_adapter *adapter)
 {
        struct e1000_hw *hw = &adapter->hw;
@@ -3295,6 +3978,7 @@ static void e1000e_setup_rss_hash(struct e1000_adapter *adapter)
        ew32(MRQC, mrqc);
 }
 
+#endif /* NETIF_F_RXHASH */
 /**
  * e1000_configure - configure the hardware for Rx and Tx
  * @adapter: private board structure
@@ -3305,13 +3989,17 @@ static void e1000_configure(struct e1000_adapter *adapter)
 
        e1000e_set_rx_mode(adapter->netdev);
 
+#ifdef NETIF_F_HW_VLAN_TX
        e1000_restore_vlan(adapter);
+#endif
        e1000_init_manageability_pt(adapter);
 
        e1000_configure_tx(adapter);
 
+#ifdef NETIF_F_RXHASH
        if (adapter->netdev->features & NETIF_F_RXHASH)
                e1000e_setup_rss_hash(adapter);
+#endif
        e1000_setup_rctl(adapter);
        e1000_configure_rx(adapter);
        adapter->alloc_rx_buf(rx_ring, e1000_desc_unused(rx_ring), GFP_KERNEL);
@@ -3388,8 +4076,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 * 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;
+                               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 */
@@ -3430,7 +4117,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                fc->pause_time = 0xFFFF;
        else
                fc->pause_time = E1000_FC_PAUSE_TIME;
-       fc->send_xon = 1;
+       fc->send_xon = true;
        fc->current_mode = fc->requested_mode;
 
        switch (hw->mac.type) {
@@ -3448,7 +4135,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                hwm = min(((pba << 10) * 9 / 10),
                          ((pba << 10) - adapter->max_frame_size));
 
-               fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
+               fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
                fc->low_water = fc->high_water - 8;
                break;
        case e1000_pchlan:
@@ -3458,14 +4145,15 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 */
                if (adapter->netdev->mtu > ETH_DATA_LEN) {
                        fc->high_water = 0x3500;
-                       fc->low_water  = 0x1500;
+                       fc->low_water = 0x1500;
                } else {
                        fc->high_water = 0x5000;
-                       fc->low_water  = 0x3000;
+                       fc->low_water = 0x3000;
                }
                fc->refresh_time = 0x1000;
                break;
        case e1000_pch2lan:
+       case e1000_pch_lpt:
                fc->high_water = 0x05C20;
                fc->low_water = 0x05048;
                fc->pause_time = 0x0650;
@@ -3484,13 +4172,13 @@ void e1000e_reset(struct e1000_adapter *adapter)
        if (adapter->itr_setting & 0x3) {
                if ((adapter->max_frame_size * 2) > (pba << 10)) {
                        if (!(adapter->flags2 & FLAG2_DISABLE_AIM)) {
-                               dev_info(&adapter->pdev->dev,
-                                       "Interrupt Throttle Rate turned off\n");
+                               dev_info(pci_dev_to_dev(adapter->pdev),
+                                        "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,
+                       dev_info(pci_dev_to_dev(adapter->pdev),
                                 "Interrupt Throttle Rate turned on\n");
                        adapter->flags2 &= ~FLAG2_DISABLE_AIM;
                        adapter->itr = 20000;
@@ -3513,11 +4201,13 @@ void e1000e_reset(struct e1000_adapter *adapter)
        if (mac->ops.init_hw(hw))
                e_err("Hardware Error\n");
 
+#ifdef NETIF_F_HW_VLAN_TX
        e1000_update_mng_vlan(adapter);
 
        /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
        ew32(VET, ETH_P_8021Q);
 
+#endif
        e1000e_reset_adaptive(hw);
 
        if (!netif_running(adapter->netdev) &&
@@ -3591,8 +4281,10 @@ static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
        e1e_flush();
 }
 
+#ifdef HAVE_NDO_GET_STATS64
 static void e1000e_update_stats(struct e1000_adapter *adapter);
 
+#endif
 void e1000e_down(struct e1000_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
@@ -3629,10 +4321,12 @@ void e1000e_down(struct e1000_adapter *adapter)
 
        netif_carrier_off(netdev);
 
+#ifdef HAVE_NDO_GET_STATS64
        spin_lock(&adapter->stats64_lock);
        e1000e_update_stats(adapter);
        spin_unlock(&adapter->stats64_lock);
 
+#endif
        e1000e_flush_descriptors(adapter);
        e1000_clean_tx_ring(adapter->tx_ring);
        e1000_clean_rx_ring(adapter->rx_ring);
@@ -3640,7 +4334,9 @@ void e1000e_down(struct e1000_adapter *adapter)
        adapter->link_speed = 0;
        adapter->link_duplex = 0;
 
+#ifdef HAVE_PCI_ERS
        if (!pci_channel_offline(adapter->pdev))
+#endif
                e1000e_reset(adapter);
 
        /*
@@ -3670,6 +4366,7 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter)
 static int __devinit e1000_sw_init(struct e1000_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_bsize0 = 128;
@@ -3678,8 +4375,25 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
        adapter->tx_ring_count = E1000_DEFAULT_TXD;
        adapter->rx_ring_count = E1000_DEFAULT_RXD;
 
+       /* Set various function pointers */
+       adapter->ei->init_ops(&adapter->hw);
+
+       rc = adapter->hw.mac.ops.init_params(&adapter->hw);
+       if (rc)
+               return rc;
+
+       rc = adapter->hw.nvm.ops.init_params(&adapter->hw);
+       if (rc)
+               return rc;
+
+       rc = adapter->hw.phy.ops.init_params(&adapter->hw);
+       if (rc)
+               return rc;
+
+#ifdef HAVE_NDO_GET_STATS64
        spin_lock_init(&adapter->stats64_lock);
 
+#endif /* HAVE_NDO_GET_STATS64 */
        e1000e_set_interrupt_capability(adapter);
 
        if (e1000_alloc_queues(adapter))
@@ -3755,7 +4469,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
        /* fire an unusual interrupt on the test handler */
        ew32(ICS, E1000_ICS_RXSEQ);
        e1e_flush();
-       msleep(100);
+       msleep(50);
 
        e1000_irq_disable(adapter);
 
@@ -3827,6 +4541,7 @@ static int e1000_open(struct net_device *netdev)
        struct pci_dev *pdev = adapter->pdev;
        int err;
 
+       adapter->pdev = pdev;
        /* disallow open during test */
        if (test_bit(__E1000_TESTING, &adapter->state))
                return -EBUSY;
@@ -3856,16 +4571,27 @@ static int e1000_open(struct net_device *netdev)
 
        e1000e_power_up_phy(adapter);
 
+#ifdef NETIF_F_HW_VLAN_TX
        adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-       if ((adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
+       if ((adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
                e1000_update_mng_vlan(adapter);
 
+#endif
        /* DMA latency requirement to workaround jumbo issue */
        if (adapter->hw.mac.type == e1000_pch2lan)
+#ifdef HAVE_PM_QOS_REQUEST_ACTIVE
                pm_qos_add_request(&adapter->netdev->pm_qos_req,
                                   PM_QOS_CPU_DMA_LATENCY,
                                   PM_QOS_DEFAULT_VALUE);
+#elif defined(HAVE_PM_QOS_REQUEST_LIST)
+               adapter->netdev->pm_qos_req =
+                   pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
+                                      PM_QOS_DEFAULT_VALUE);
+#else
+               pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY,
+                                      adapter->netdev->name,
+                                      PM_QOS_DEFAULT_VALUE);
+#endif
 
        /*
         * before we allocate an interrupt, we must be ready to handle it.
@@ -3895,7 +4621,9 @@ static int e1000_open(struct net_device *netdev)
        /* From here on the code is the same as e1000e_up() */
        clear_bit(__E1000_DOWN, &adapter->state);
 
+#ifdef CONFIG_E1000E_NAPI
        napi_enable(&adapter->napi);
+#endif
 
        e1000_irq_enable(adapter);
 
@@ -3943,6 +4671,8 @@ static int e1000_close(struct net_device *netdev)
        struct pci_dev *pdev = adapter->pdev;
        int count = E1000_CHECK_RESET_COUNT;
 
+       adapter->pdev = pdev;
+
        while (test_bit(__E1000_RESETTING, &adapter->state) && count--)
                usleep_range(10000, 20000);
 
@@ -3950,8 +4680,10 @@ static int e1000_close(struct net_device *netdev)
 
        pm_runtime_get_sync(&pdev->dev);
 
+#ifdef CONFIG_E1000E_NAPI
        napi_disable(&adapter->napi);
 
+#endif
        if (!test_bit(__E1000_DOWN, &adapter->state)) {
                e1000e_down(adapter);
                e1000_free_irq(adapter);
@@ -3961,14 +4693,22 @@ static int e1000_close(struct net_device *netdev)
        e1000e_free_tx_resources(adapter->tx_ring);
        e1000e_free_rx_resources(adapter->rx_ring);
 
+#ifdef NETIF_F_HW_VLAN_TX
        /*
         * 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)
+#ifdef HAVE_VLAN_RX_REGISTER
+       if ((adapter->hw.mng_cookie.status &
+            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
+           !(adapter->vlgrp &&
+             vlan_group_get_device(adapter->vlgrp, adapter->mng_vlan_id)))
+#else /* HAVE_VLAN_RX_REGISTER */
+       if (adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
+#endif /* HAVE_VLAN_RX_REGISTER */
                e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
 
+#endif /* NETIF_F_HW_VLAN_TX */
        /*
         * If AMT is enabled, let the firmware know that the network
         * interface is now closed
@@ -3978,12 +4718,23 @@ static int e1000_close(struct net_device *netdev)
                e1000e_release_hw_control(adapter);
 
        if (adapter->hw.mac.type == e1000_pch2lan)
+#ifdef HAVE_PM_QOS_REQUEST_ACTIVE
                pm_qos_remove_request(&adapter->netdev->pm_qos_req);
+#elif defined(HAVE_PM_QOS_REQUEST_LIST)
+       {
+               pm_qos_remove_request(adapter->netdev->pm_qos_req);
+               adapter->netdev->pm_qos_req = NULL;
+       }
+#else
+               pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
+                                         adapter->netdev->name);
+#endif
 
        pm_runtime_put_sync(&pdev->dev);
 
        return 0;
 }
+
 /**
  * e1000_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
@@ -3996,7 +4747,7 @@ 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))
+       if (!is_valid_ether_addr((unsigned char *)(addr->sa_data)))
                return -EADDRNOTAVAIL;
 
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
@@ -4017,8 +4768,8 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
                 * RAR[14]
                 */
                e1000e_rar_set(&adapter->hw,
-                             adapter->hw.mac.addr,
-                             adapter->hw.mac.rar_entry_count - 1);
+                              adapter->hw.mac.addr,
+                              adapter->hw.mac.rar_entry_count - 1);
        }
 
        return 0;
@@ -4035,7 +4786,8 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
 static void e1000e_update_phy_task(struct work_struct *work)
 {
        struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, update_phy_task);
+                                                    struct e1000_adapter,
+                                                    update_phy_task);
 
        if (test_bit(__E1000_DOWN, &adapter->state))
                return;
@@ -4049,7 +4801,7 @@ static void e1000e_update_phy_task(struct work_struct *work)
  */
 static void e1000_update_phy_info(unsigned long data)
 {
-       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
 
        if (test_bit(__E1000_DOWN, &adapter->state))
                return;
@@ -4139,11 +4891,19 @@ release:
  * e1000e_update_stats - Update the board statistics counters
  * @adapter: board private structure
  **/
+#ifdef HAVE_NDO_GET_STATS64
 static void e1000e_update_stats(struct e1000_adapter *adapter)
+#else
+void e1000e_update_stats(struct e1000_adapter *adapter)
+#endif
 {
+#ifdef HAVE_NETDEV_STATS_IN_NETDEV
        struct net_device *netdev = adapter->netdev;
+#endif
        struct e1000_hw *hw = &adapter->hw;
+#ifdef HAVE_PCI_ERS
        struct pci_dev *pdev = adapter->pdev;
+#endif
 
        /*
         * Prevent stats update while adapter is being reset, or if the pci
@@ -4151,13 +4911,15 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
         */
        if (adapter->link_speed == 0)
                return;
+#ifdef HAVE_PCI_ERS
        if (pci_channel_offline(pdev))
                return;
+#endif
 
        adapter->stats.crcerrs += er32(CRCERRS);
        adapter->stats.gprc += er32(GPRC);
        adapter->stats.gorc += er32(GORCL);
-       er32(GORCH); /* Clear gorc */
+       er32(GORCH);            /* Clear gorc */
        adapter->stats.bprc += er32(BPRC);
        adapter->stats.mprc += er32(MPRC);
        adapter->stats.roc += er32(ROC);
@@ -4190,7 +4952,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
        adapter->stats.xofftxc += er32(XOFFTXC);
        adapter->stats.gptc += er32(GPTC);
        adapter->stats.gotc += er32(GOTCL);
-       er32(GOTCH); /* Clear gotc */
+       er32(GOTCH);            /* Clear gotc */
        adapter->stats.rnbc += er32(RNBC);
        adapter->stats.ruc += er32(RUC);
 
@@ -4209,8 +4971,13 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
        adapter->stats.tsctfc += er32(TSCTFC);
 
        /* Fill out the OS statistics structure */
+#ifdef HAVE_NETDEV_STATS_IN_NETDEV
        netdev->stats.multicast = adapter->stats.mprc;
        netdev->stats.collisions = adapter->stats.colc;
+#else
+       adapter->net_stats.multicast = adapter->stats.mprc;
+       adapter->net_stats.collisions = adapter->stats.colc;
+#endif
 
        /* Rx Errors */
 
@@ -4218,22 +4985,40 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
         * RLEC on some newer hardware can be incorrect so build
         * our own version based on RUC and ROC
         */
+#ifdef HAVE_NETDEV_STATS_IN_NETDEV
        netdev->stats.rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
+#else
+       adapter->net_stats.rx_errors = adapter->stats.rxerrc +
+#endif
+           adapter->stats.crcerrs + adapter->stats.algnerrc +
+           adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;
+#ifdef HAVE_NETDEV_STATS_IN_NETDEV
        netdev->stats.rx_length_errors = adapter->stats.ruc +
-                                             adapter->stats.roc;
+           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;
+#else
+       adapter->net_stats.rx_length_errors = adapter->stats.ruc +
+           adapter->stats.roc;
+       adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;
+       adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;
+       adapter->net_stats.rx_missed_errors = adapter->stats.mpc;
+#endif
 
        /* Tx Errors */
-       netdev->stats.tx_errors = adapter->stats.ecol +
-                                      adapter->stats.latecol;
+#ifdef HAVE_NETDEV_STATS_IN_NETDEV
+       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;
+#else
+       adapter->net_stats.tx_errors = adapter->stats.ecol +
+           adapter->stats.latecol;
+       adapter->net_stats.tx_aborted_errors = adapter->stats.ecol;
+       adapter->net_stats.tx_window_errors = adapter->stats.latecol;
+       adapter->net_stats.tx_carrier_errors = adapter->stats.tncrs;
+#endif
 
        /* Tx Dropped needs to be maintained elsewhere */
 
@@ -4243,6 +5028,7 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
        adapter->stats.mgpdc += er32(MGTPDC);
 }
 
+#ifdef SIOCGMIIPHY
 /**
  * e1000_phy_read_status - Update the PHY register status snapshot
  * @adapter: board private structure
@@ -4256,7 +5042,7 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
            (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_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);
@@ -4285,19 +5071,20 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
        }
 }
 
+#endif /* SIOCGMIIPHY */
 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 Duplex, Flow Control: %s\n",
-               adapter->netdev->name,
-               adapter->link_speed,
-               adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half",
-               (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" :
-               (ctrl & E1000_CTRL_RFCE) ? "Rx" :
-               (ctrl & E1000_CTRL_TFCE) ? "Tx" : "None");
+       printk(KERN_INFO
+              "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",
+              adapter->netdev->name, adapter->link_speed,
+              adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half",
+              (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)
@@ -4380,7 +5167,7 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
  **/
 static void e1000_watchdog(unsigned long data)
 {
-       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
 
        /* Do the rest outside of interrupt context */
        schedule_work(&adapter->watchdog_task);
@@ -4391,7 +5178,8 @@ static void e1000_watchdog(unsigned long data)
 static void e1000_watchdog_task(struct work_struct *work)
 {
        struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, watchdog_task);
+                                                    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;
@@ -4410,11 +5198,12 @@ static void e1000_watchdog_task(struct work_struct *work)
                e1000e_enable_receives(adapter);
                goto link_up;
        }
-
+#ifdef NETIF_F_HW_VLAN_TX
        if ((e1000e_enable_tx_pkt_filtering(hw)) &&
            (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id))
                e1000_update_mng_vlan(adapter);
 
+#endif
        if (link) {
                if (!netif_carrier_ok(netdev)) {
                        bool txb2b = true;
@@ -4422,11 +5211,13 @@ static void e1000_watchdog_task(struct work_struct *work)
                        /* Cancel scheduled suspend requests. */
                        pm_runtime_resume(netdev->dev.parent);
 
+#ifdef SIOCGMIIPHY
                        /* update snapshot of PHY registers on LSC */
                        e1000_phy_read_status(adapter);
+#endif
                        mac->ops.get_link_up_info(&adapter->hw,
-                                                  &adapter->link_speed,
-                                                  &adapter->link_duplex);
+                                                 &adapter->link_speed,
+                                                 &adapter->link_duplex);
                        e1000_print_link_info(adapter);
                        /*
                         * On supported PHYs, check for duplex mismatch only
@@ -4470,7 +5261,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                                tarc0 &= ~SPEED_MODE_BIT;
                                ew32(TARC(0), tarc0);
                        }
-
+#ifdef NETIF_F_TSO
                        /*
                         * disable TSO for pcie and 10/100 speeds, to avoid
                         * some hardware issues
@@ -4481,17 +5272,22 @@ static void e1000_watchdog_task(struct work_struct *work)
                                case SPEED_100:
                                        e_info("10/100 speed: disabling TSO\n");
                                        netdev->features &= ~NETIF_F_TSO;
+#ifdef NETIF_F_TSO6
                                        netdev->features &= ~NETIF_F_TSO6;
+#endif
                                        break;
                                case SPEED_1000:
                                        netdev->features |= NETIF_F_TSO;
+#ifdef NETIF_F_TSO6
                                        netdev->features |= NETIF_F_TSO6;
+#endif
                                        break;
                                default:
                                        /* oops */
                                        break;
                                }
                        }
+#endif
 
                        /*
                         * enable transmits in the hardware, need to do this
@@ -4501,7 +5297,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                        tctl |= E1000_TCTL_EN;
                        ew32(TCTL, tctl);
 
-                        /*
+                       /*
                         * Perform any post-link-up configuration before
                         * reporting link up.
                         */
@@ -4530,12 +5326,14 @@ static void e1000_watchdog_task(struct work_struct *work)
                                schedule_work(&adapter->reset_task);
                        else
                                pm_schedule_suspend(netdev->dev.parent,
-                                                       LINK_TIMEOUT);
+                                                   LINK_TIMEOUT);
                }
        }
 
 link_up:
+#ifdef HAVE_NDO_GET_STATS64
        spin_lock(&adapter->stats64_lock);
+#endif
        e1000e_update_stats(adapter);
 
        mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
@@ -4547,7 +5345,9 @@ link_up:
        adapter->gorc_old = adapter->stats.gorc;
        adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
        adapter->gotc_old = adapter->stats.gotc;
+#ifdef HAVE_NDO_GET_STATS64
        spin_unlock(&adapter->stats64_lock);
+#endif
 
        e1000e_update_adaptive(&adapter->hw);
 
@@ -4573,8 +5373,8 @@ link_up:
                 */
                u32 goc = (adapter->gotc + adapter->gorc) / 10000;
                u32 dif = (adapter->gotc > adapter->gorc ?
-                           adapter->gotc - adapter->gorc :
-                           adapter->gorc - adapter->gotc) / 10000;
+                          adapter->gotc - adapter->gorc :
+                          adapter->gorc - adapter->gotc) / 10000;
                u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
 
                ew32(ITR, 1000000000 / (itr * 256));
@@ -4612,11 +5412,13 @@ link_up:
 #define E1000_TX_FLAGS_VLAN            0x00000002
 #define E1000_TX_FLAGS_TSO             0x00000004
 #define E1000_TX_FLAGS_IPV4            0x00000008
+#define E1000_TX_FLAGS_NO_FCS          0x00000010
 #define E1000_TX_FLAGS_VLAN_MASK       0xffff0000
 #define E1000_TX_FLAGS_VLAN_SHIFT      16
 
 static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
 {
+#ifdef NETIF_F_TSO
        struct e1000_context_desc *context_desc;
        struct e1000_buffer *buffer_info;
        unsigned int i;
@@ -4641,15 +5443,17 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
                iph->tot_len = 0;
                iph->check = 0;
                tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
-                                                        0, IPPROTO_TCP, 0);
+                                                        0, IPPROTO_TCP, 0);
                cmd_length = E1000_TXD_CMD_IP;
                ipcse = skb_transport_offset(skb) - 1;
+#ifdef NETIF_F_TSO6
        } 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);
+                                                      &ipv6_hdr(skb)->daddr,
+                                                      0, IPPROTO_TCP, 0);
                ipcse = 0;
+#endif /* NETIF_F_TSO6 */
        }
        ipcss = skb_network_offset(skb);
        ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
@@ -4658,19 +5462,19 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
        tucse = 0;
 
        cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                      E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
+                      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->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.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);
 
@@ -4683,6 +5487,9 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
        tx_ring->next_to_use = i;
 
        return 1;
+#else /* NETIF_F_TSO */
+       return 0;
+#endif /* NETIF_F_TSO */
 }
 
 static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
@@ -4698,10 +5505,14 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
        if (skb->ip_summed != CHECKSUM_PARTIAL)
                return 0;
 
+#ifdef NETIF_F_HW_VLAN_TX
        if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
                protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
        else
                protocol = skb->protocol;
+#else
+       protocol = skb->protocol;
+#endif
 
        switch (protocol) {
        case cpu_to_be16(ETH_P_IP):
@@ -4728,8 +5539,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
 
        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.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);
@@ -4768,11 +5578,11 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
                buffer_info->length = size;
                buffer_info->time_stamp = jiffies;
                buffer_info->next_to_watch = i;
-               buffer_info->dma = dma_map_single(&pdev->dev,
+               buffer_info->dma = dma_map_single(pci_dev_to_dev(pdev),
                                                  skb->data + offset,
                                                  size, DMA_TO_DEVICE);
                buffer_info->mapped_as_page = false;
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+               if (dma_mapping_error(pci_dev_to_dev(pdev), buffer_info->dma))
                        goto dma_error;
 
                len -= size;
@@ -4787,10 +5597,10 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
        }
 
        for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
+               const struct skb_frag_struct *frag;
 
                frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
+               len = skb_frag_size(frag);
                offset = 0;
 
                while (len) {
@@ -4804,10 +5614,12 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
                        buffer_info->length = size;
                        buffer_info->time_stamp = jiffies;
                        buffer_info->next_to_watch = i;
-                       buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,
-                                               offset, size, DMA_TO_DEVICE);
+                       buffer_info->dma =
+                           skb_frag_dma_map(pci_dev_to_dev(pdev), frag, offset,
+                                            size, DMA_TO_DEVICE);
                        buffer_info->mapped_as_page = true;
-                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                       if (dma_mapping_error
+                           (pci_dev_to_dev(pdev), buffer_info->dma))
                                goto dma_error;
 
                        len -= size;
@@ -4816,7 +5628,11 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
                }
        }
 
+#ifdef NETIF_F_TSO
        segs = skb_shinfo(skb)->gso_segs ? : 1;
+#else
+       segs = 1;
+#endif
        /* multiply data chunks by size of headers */
        bytecount = ((segs - 1) * skb_headlen(skb)) + skb->len;
 
@@ -4828,7 +5644,7 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
        return count;
 
 dma_error:
-       dev_err(&pdev->dev, "Tx DMA map failed\n");
+       dev_err(pci_dev_to_dev(pdev), "Tx DMA map failed\n");
        buffer_info->dma = 0;
        if (count)
                count--;
@@ -4854,7 +5670,7 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 
        if (tx_flags & E1000_TX_FLAGS_TSO) {
                txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                            E1000_TXD_CMD_TSE;
+                   E1000_TXD_CMD_TSE;
                txd_upper |= E1000_TXD_POPTS_TXSM << 8;
 
                if (tx_flags & E1000_TX_FLAGS_IPV4)
@@ -4871,6 +5687,9 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
                txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
        }
 
+       if (unlikely(tx_flags & E1000_TX_FLAGS_NO_FCS))
+               txd_lower &= ~(E1000_TXD_CMD_IFCS);
+
        i = tx_ring->next_to_use;
 
        do {
@@ -4878,7 +5697,7 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
                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);
+                   cpu_to_le32(txd_lower | buffer_info->length);
                tx_desc->upper.data = cpu_to_le32(txd_upper);
 
                i++;
@@ -4888,6 +5707,10 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 
        tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
 
+       /* txd_cmd re-enables FCS, so we'll re-disable it here as desired. */
+       if (unlikely(tx_flags & E1000_TX_FLAGS_NO_FCS))
+               tx_desc->lower.data &= ~(cpu_to_le32(E1000_TXD_CMD_IFCS));
+
        /*
         * Force memory writes to complete before letting h/w
         * know there are new descriptors to fetch.  (Only
@@ -4914,24 +5737,26 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
                                    struct sk_buff *skb)
 {
-       struct e1000_hw *hw =  &adapter->hw;
+       struct e1000_hw *hw = &adapter->hw;
        u16 length, offset;
 
+#ifdef NETIF_F_HW_VLAN_TX
        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)))
+               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;
        }
-
+#endif
        if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
                return 0;
 
-       if (((struct ethhdr *) skb->data)->h_proto != htons(ETH_P_IP))
+       if (((struct ethhdr *)skb->data)->h_proto != htons(ETH_P_IP))
                return 0;
 
        {
-               const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14);
+               const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data + 14);
                struct udphdr *udp;
 
                if (ip->protocol != IPPROTO_UDP)
@@ -5007,7 +5832,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
-
+#ifdef NETIF_F_TSO
        mss = skb_shinfo(skb)->gso_size;
        /*
         * The controller does a simple calculation to
@@ -5049,13 +5874,20 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
        if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
                count++;
        count++;
+#else
+       mss = 0;
+
+       if (skb->ip_summed == CHECKSUM_PARTIAL)
+               count++;
+#endif
 
        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);
+               count +=
+                   TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->frags[f]),
+                                 max_txd_pwr);
 
        if (adapter->hw.mac.tx_pkt_filtering)
                e1000_transfer_dhcp_info(adapter, skb);
@@ -5067,11 +5899,12 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
        if (e1000_maybe_stop_tx(tx_ring, count + 2))
                return NETDEV_TX_BUSY;
 
+#ifdef NETIF_F_HW_VLAN_TX
        if (vlan_tx_tag_present(skb)) {
                tx_flags |= E1000_TX_FLAGS_VLAN;
                tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
        }
-
+#endif
        first = tx_ring->next_to_use;
 
        tso = e1000_tso(tx_ring, skb);
@@ -5093,18 +5926,26 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
        if (skb->protocol == htons(ETH_P_IP))
                tx_flags |= E1000_TX_FLAGS_IPV4;
 
+#ifdef IFF_SUPP_NOFCS
+       if (unlikely(skb->no_fcs))
+               tx_flags |= E1000_TX_FLAGS_NO_FCS;
+#endif /* IFF_SUPP_NOFCS */
+
        /* if count is 0 then mapping error has occurred */
        count = e1000_tx_map(tx_ring, skb, first, max_per_txd, nr_frags, mss);
        if (count) {
+#ifdef CONFIG_BQL
+               netdev_sent_queue(netdev, skb->len);
+#endif
                e1000_tx_queue(tx_ring, tx_flags, count);
                /* Make sure there is space in the ring for the next send. */
                e1000_maybe_stop_tx(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;
        }
+       netdev->trans_start = jiffies;
 
        return NETDEV_TX_OK;
 }
@@ -5139,6 +5980,7 @@ static void e1000_reset_task(struct work_struct *work)
        e1000e_reinit_locked(adapter);
 }
 
+#ifdef HAVE_NDO_GET_STATS64
 /**
  * e1000_get_stats64 - Get System Network Statistics
  * @netdev: network interface device structure
@@ -5147,7 +5989,7 @@ static void e1000_reset_task(struct work_struct *work)
  * 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 rtnl_link_stats64 *stats)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
 
@@ -5169,18 +6011,15 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
         * 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;
+           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_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;
@@ -5190,6 +6029,27 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
        spin_unlock(&adapter->stats64_lock);
        return stats;
 }
+#else /* HAVE_NDO_GET_STATS64 */
+/**
+ * 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)
+{
+#ifndef HAVE_NETDEV_STATS_IN_NETDEV
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /* only return the current stats */
+       return &adapter->net_stats;
+#else /* HAVE_NETDEV_STATS_IN_NETDEV */
+       /* only return the current stats */
+       return &netdev->stats;
+#endif /* HAVE_NETDEV_STATS_IN_NETDEV */
+}
+#endif /* HAVE_NDO_GET_STATS64 */
 
 /**
  * e1000_change_mtu - Change the Maximum Transfer Unit
@@ -5209,7 +6069,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                        e_err("Jumbo Frames not supported.\n");
                        return -EINVAL;
                }
-
+#ifdef HAVE_NDO_SET_FEATURES
                /*
                 * IP payload checksum (enabled with jumbos/packet-split when
                 * Rx checksum is enabled) and generation of RSS hash is
@@ -5217,16 +6077,10 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                 */
                if ((netdev->features & NETIF_F_RXCSUM) &&
                    (netdev->features & NETIF_F_RXHASH)) {
-                       /* Disable receive hashing */
-                       netdev_features_t features;
-
-                       features = netdev->features & (~NETIF_F_RXHASH);
-                       if (e1000_set_features(netdev, features)) {
-                               e_err("Jumbo frames cannot be enabled when both receive checksum offload and receive hashing are enabled.  Disable one of the receive offload features before enabling jumbos.\n");
-                               return -EINVAL;
-                       }
-                       e_info("Jumbo frames cannot be enabled when both receive checksum offload and receive hashing are enabled. Disabling Receive Hashing.\n");
+                       e_err("Jumbo frames cannot be enabled when both receive checksum offload and receive hashing are enabled.  Disable one of the receive offload features before enabling jumbos.\n");
+                       return -EINVAL;
                }
+#endif /* HAVE_NDO_SET_FEATURES */
        }
 
        /* Supported frame sizes */
@@ -5236,11 +6090,11 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                return -EINVAL;
        }
 
-       /* Jumbo frame workaround on 82579 requires CRC be stripped */
-       if ((adapter->hw.mac.type == e1000_pch2lan) &&
+       /* Jumbo frame workaround on 82579 and newer 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");
+               e_err("Jumbo Frames not supported on this device when CRC stripping is disabled.\n");
                return -EINVAL;
        }
 
@@ -5272,14 +6126,23 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 
        if (max_frame <= 2048)
                adapter->rx_buffer_len = 2048;
+#ifdef CONFIG_E1000E_NAPI
        else
                adapter->rx_buffer_len = 4096;
+#else
+       else if (max_frame <= 4096)
+               adapter->rx_buffer_len = 4096;
+       else if (max_frame <= 8192)
+               adapter->rx_buffer_len = 8192;
+       else if (max_frame <= 16384)
+               adapter->rx_buffer_len = 16384;
+#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))
+           (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
                adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN
-                                        + ETH_FCS_LEN;
+                   + ETH_FCS_LEN;
 
        if (netif_running(netdev))
                e1000e_up(adapter);
@@ -5291,6 +6154,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
        return 0;
 }
 
+#if defined(SIOCGMIIPHY) || defined(SIOCGMIIREG) || defined(SIOCSMIIREG)
 static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
                           int cmd)
 {
@@ -5301,9 +6165,12 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
                return -EOPNOTSUPP;
 
        switch (cmd) {
+#ifdef SIOCGMIIPHY
        case SIOCGMIIPHY:
                data->phy_id = adapter->hw.phy.addr;
                break;
+#endif
+#ifdef SIOCGMIIREG
        case SIOCGMIIREG:
                e1000_phy_read_status(adapter);
 
@@ -5342,20 +6209,36 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
                        return -EIO;
                }
                break;
+#endif
+#ifdef SIOCGMIIREG
        case SIOCSMIIREG:
+#endif
        default:
                return -EOPNOTSUPP;
        }
        return 0;
 }
+#endif /* defined(SIOCGMIIPHY||SIOCGMIIREG||SIOCSMIIREG) */
 
 static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
        switch (cmd) {
+#ifdef SIOCGMIIPHY
        case SIOCGMIIPHY:
+#endif
+#ifdef SIOCGMIIREG
        case SIOCGMIIREG:
+#endif
+#ifdef SIOCSMIIREG
        case SIOCSMIIREG:
+#endif
+#if defined(SIOCGMIIPHY) || defined(SIOCGMIIREG) || defined(SIOCSMIIREG)
                return e1000_mii_ioctl(netdev, ifr, cmd);
+#endif
+#ifdef ETHTOOL_OPS_COMPAT
+       case SIOCETHTOOL:
+               return ethtool_ioctl(ifr);
+#endif
        default:
                return -EOPNOTSUPP;
        }
@@ -5401,7 +6284,7 @@ static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
        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);
+                           << BM_RCTL_MO_SHIFT);
        if (mac_reg & E1000_RCTL_BAM)
                phy_reg |= BM_RCTL_BAM;
        if (mac_reg & E1000_RCTL_PMCF)
@@ -5476,9 +6359,9 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
 
                ctrl = er32(CTRL);
                /* advertise wake from D3Cold */
-               #define E1000_CTRL_ADVD3WUC 0x00100000
+#define E1000_CTRL_ADVD3WUC 0x00100000
                /* phy power management enable */
-               #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
+#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;
@@ -5546,8 +6429,7 @@ static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
        pci_set_power_state(pdev, PCI_D3hot);
 }
 
-static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
-                                    bool wake)
+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);
@@ -5565,7 +6447,7 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
 
                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));
+                                     (devctl & ~PCI_EXP_DEVCTL_CERE));
 
                e1000_power_off(pdev, sleep, wake);
 
@@ -5606,7 +6488,7 @@ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
 #endif
 static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
 {
-       dev_info(&pdev->dev, "Disabling ASPM %s %s\n",
+       dev_info(pci_dev_to_dev(pdev), "Disabling ASPM %s %s\n",
                 (state & PCIE_LINK_STATE_L0S) ? "L0s" : "",
                 (state & PCIE_LINK_STATE_L1) ? "L1" : "");
 
@@ -5638,6 +6520,20 @@ static int __e1000_resume(struct pci_dev *pdev)
        pci_restore_state(pdev);
        pci_save_state(pdev);
 
+#ifndef HAVE_SYSTEM_SLEEP_PM_OPS
+       err = pci_enable_device_mem(pdev);
+       if (err) {
+               dev_err(pci_dev_to_dev(pdev),
+                       "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);
+
+#endif /* HAVE_SYSTEM_SLEEP_PM_OPS */
        e1000e_set_interrupt_capability(adapter);
        if (netif_running(netdev)) {
                err = e1000_request_irq(adapter);
@@ -5645,7 +6541,7 @@ static int __e1000_resume(struct pci_dev *pdev)
                        return err;
        }
 
-       if (hw->mac.type == e1000_pch2lan)
+       if (hw->mac.type >= e1000_pch2lan)
                e1000_resume_workarounds_pchlan(&adapter->hw);
 
        e1000e_power_up_phy(adapter);
@@ -5657,24 +6553,24 @@ static int __e1000_resume(struct pci_dev *pdev)
                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");
+                              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");
+                              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);
        }
@@ -5700,9 +6596,15 @@ static int __e1000_resume(struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
 static int e1000_suspend(struct device *dev)
+#else
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
+#endif
 {
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
        struct pci_dev *pdev = to_pci_dev(dev);
+#endif
        int retval;
        bool wake;
 
@@ -5713,9 +6615,15 @@ static int e1000_suspend(struct device *dev)
        return retval;
 }
 
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
 static int e1000_resume(struct device *dev)
+#else
+static int e1000_resume(struct pci_dev *pdev)
+#endif
 {
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
        struct pci_dev *pdev = to_pci_dev(dev);
+#endif
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct e1000_adapter *adapter = netdev_priv(netdev);
 
@@ -5727,6 +6635,7 @@ static int e1000_resume(struct device *dev)
 #endif /* CONFIG_PM_SLEEP */
 
 #ifdef CONFIG_PM_RUNTIME
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
 static int e1000_runtime_suspend(struct device *dev)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -5772,9 +6681,11 @@ static int e1000_runtime_resume(struct device *dev)
        adapter->idle_check = !dev->power.runtime_auto;
        return __e1000_resume(pdev);
 }
+#endif /* HAVE_SYSTEM_SLEEP_PM_OPS */
 #endif /* CONFIG_PM_RUNTIME */
 #endif /* CONFIG_PM */
 
+#ifndef USE_REBOOT_NOTIFIER
 static void e1000_shutdown(struct pci_dev *pdev)
 {
        bool wake = false;
@@ -5784,6 +6695,37 @@ static void e1000_shutdown(struct pci_dev *pdev)
        if (system_state == SYSTEM_POWER_OFF)
                e1000_complete_shutdown(pdev, false, wake);
 }
+#else
+static struct pci_driver e1000_driver;
+static int e1000_notify_reboot(struct notifier_block *nb, unsigned long event,
+                              void *ptr)
+{
+       struct pci_dev *pdev = NULL;
+       bool wake = false;
+
+       switch (event) {
+       case SYS_DOWN:
+       case SYS_HALT:
+       case SYS_POWER_OFF:
+               while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
+                       if (pci_dev_driver(pdev) == &e1000_driver) {
+                               __e1000_shutdown(pdev, &wake, false);
+                               if (event == SYS_POWER_OFF)
+                                       e1000_complete_shutdown(pdev, false,
+                                                               wake);
+                       }
+               }
+               break;
+       }
+       return NOTIFY_DONE;
+}
+
+static struct notifier_block e1000_notifier_reboot = {
+       .notifier_call = e1000_notify_reboot,
+       .next = NULL,
+       .priority = 0
+};
+#endif /* USE_REBOOT_NOTIFIER */
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 
@@ -5835,7 +6777,7 @@ static void e1000_netpoll(struct net_device *netdev)
                e1000_intr_msi(adapter->pdev->irq, netdev);
                enable_irq(adapter->pdev->irq);
                break;
-       default: /* E1000E_INT_MODE_LEGACY */
+       default:                /* E1000E_INT_MODE_LEGACY */
                disable_irq(adapter->pdev->irq);
                e1000_intr(adapter->pdev->irq, netdev);
                enable_irq(adapter->pdev->irq);
@@ -5844,6 +6786,7 @@ static void e1000_netpoll(struct net_device *netdev)
 }
 #endif
 
+#ifdef HAVE_PCI_ERS
 /**
  * e1000_io_error_detected - called when PCI error is detected
  * @pdev: Pointer to PCI device
@@ -5896,13 +6839,13 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 
        err = pci_enable_device_mem(pdev);
        if (err) {
-               dev_err(&pdev->dev,
+               dev_err(pci_dev_to_dev(pdev),
                        "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_save_state(pdev);
 
                pci_enable_wake(pdev, PCI_D3hot, 0);
                pci_enable_wake(pdev, PCI_D3cold, 0);
@@ -5934,7 +6877,7 @@ static void e1000_io_resume(struct pci_dev *pdev)
 
        if (netif_running(netdev)) {
                if (e1000e_up(adapter)) {
-                       dev_err(&pdev->dev,
+                       dev_err(pci_dev_to_dev(pdev),
                                "can't bring device back up after reset\n");
                        return;
                }
@@ -5951,6 +6894,7 @@ static void e1000_io_resume(struct pci_dev *pdev)
                e1000e_get_hw_control(adapter);
 
 }
+#endif /* HAVE_PCI_ERS */
 
 static void e1000_print_device_info(struct e1000_adapter *adapter)
 {
@@ -5960,12 +6904,14 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
        u8 pba_str[E1000_PBANUM_LENGTH];
 
        /* print bus type/speed/width info */
-       e_info("(PCI Express:2.5GT/s:%s) %pM\n",
+       e_info("(PCI Express:2.5GT/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
               /* bus width */
               ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-               "Width x1"),
+               "Width x1"),
               /* MAC address */
-              netdev->dev_addr);
+              netdev->dev_addr[0], netdev->dev_addr[1],
+              netdev->dev_addr[2], netdev->dev_addr[3],
+              netdev->dev_addr[4], netdev->dev_addr[5]);
        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,
@@ -5989,22 +6935,37 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
        le16_to_cpus(&buf);
        if (!ret_val && (!(buf & (1 << 0)))) {
                /* Deep Smart Power Down (DSPD) */
-               dev_warn(&adapter->pdev->dev,
+               dev_warn(pci_dev_to_dev(adapter->pdev),
                         "Warning: detected DSPD enabled in EEPROM\n");
        }
 }
 
+s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
+{
+       u16 cap_offset;
+
+       cap_offset = pci_find_capability(hw->adapter->pdev, PCI_CAP_ID_EXP);
+       if (!cap_offset)
+               return -E1000_ERR_CONFIG;
+
+       pci_read_config_word(hw->adapter->pdev, cap_offset + reg, value);
+
+       return 0;
+}
+
+#ifdef HAVE_NDO_SET_FEATURES
 static int e1000_set_features(struct net_device *netdev,
                              netdev_features_t features)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
-       u32 changed = features ^ netdev->features;
+       netdev_features_t changed = features ^ netdev->features;
 
        if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
                adapter->flags |= FLAG_TSO_FORCE;
 
        if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
-                        NETIF_F_RXCSUM | NETIF_F_RXHASH)))
+                        NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_RXFCS |
+                        NETIF_F_RXALL)))
                return 0;
 
        /*
@@ -6018,6 +6979,20 @@ static int e1000_set_features(struct net_device *netdev,
                return -EINVAL;
        }
 
+       if (changed & NETIF_F_RXFCS) {
+               if (features & NETIF_F_RXFCS) {
+                       adapter->flags2 &= ~FLAG2_CRC_STRIPPING;
+               } else {
+                       /* We need to take it back to defaults, which might mean
+                        * stripping is still disabled at the adapter level.
+                        */
+                       if (adapter->flags2 & FLAG2_DFLT_CRC_STRIPPING)
+                               adapter->flags2 |= FLAG2_CRC_STRIPPING;
+                       else
+                               adapter->flags2 &= ~FLAG2_CRC_STRIPPING;
+               }
+       }
+
        netdev->features = features;
 
        if (netif_running(netdev))
@@ -6028,30 +7003,44 @@ static int e1000_set_features(struct net_device *netdev,
        return 0;
 }
 
+#endif /* HAVE_NDO_SET_FEATURES */
+#ifdef HAVE_NET_DEVICE_OPS
 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_rx_mode        = e1000e_set_rx_mode,
-       .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,
+       .ndo_open = e1000_open,
+       .ndo_stop = e1000_close,
+       .ndo_start_xmit = e1000_xmit_frame,
+#ifdef HAVE_NDO_GET_STATS64
+       .ndo_get_stats64 = e1000e_get_stats64,
+#else /* HAVE_NDO_GET_STATS64 */
+       .ndo_get_stats = e1000_get_stats,
+#endif /* HAVE_NDO_GET_STATS64 */
+       .ndo_set_rx_mode = e1000e_set_rx_mode,
+       .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,
+
+#ifdef NETIF_F_HW_VLAN_TX
+#ifdef HAVE_VLAN_RX_REGISTER
+       .ndo_vlan_rx_register = e1000_vlan_rx_register,
+#endif
+       .ndo_vlan_rx_add_vid = e1000_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid = e1000_vlan_rx_kill_vid,
+#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e1000_netpoll,
+       .ndo_poll_controller = e1000_netpoll,
 #endif
+#ifdef HAVE_NDO_SET_FEATURES
        .ndo_set_features = e1000_set_features,
+#endif /* HAVE_NDO_SET_FEATURES */
 };
 
+#endif /* HAVE_NET_DEVICE_OPS */
 /**
  * e1000_probe - Device Initialization Routine
  * @pdev: PCI device information struct
- * @ent: entry in e1000_pci_tbl
+ * @ent: entry in e1000e_pci_tbl
  *
  * Returns 0 on success, negative on failure
  *
@@ -6068,7 +7057,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        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;
@@ -6087,26 +7075,31 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                return err;
 
        pci_using_dac = 0;
-       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+       err = dma_set_mask(pci_dev_to_dev(pdev), DMA_BIT_MASK(64));
        if (!err) {
-               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               err =
+                   dma_set_coherent_mask(pci_dev_to_dev(pdev),
+                                         DMA_BIT_MASK(64));
                if (!err)
                        pci_using_dac = 1;
        } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               err = dma_set_mask(pci_dev_to_dev(pdev), DMA_BIT_MASK(32));
                if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
+                       err = dma_set_coherent_mask(pci_dev_to_dev(pdev),
                                                    DMA_BIT_MASK(32));
                        if (err) {
-                               dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
+                               dev_err(pci_dev_to_dev(pdev),
+                                       "No usable DMA configuration, aborting\n");
                                goto err_dma;
                        }
                }
        }
 
+/* *INDENT-OFF* */
        err = pci_request_selected_regions_exclusive(pdev,
-                                         pci_select_bars(pdev, IORESOURCE_MEM),
-                                         e1000e_driver_name);
+                                       pci_select_bars(pdev, IORESOURCE_MEM),
+                                       e1000e_driver_name);
+/* *INDENT-ON* */
        if (err)
                goto err_pci_reg;
 
@@ -6114,23 +7107,27 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        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);
+       SET_MODULE_OWNER(netdev);
+       SET_NETDEV_DEV(netdev, pci_dev_to_dev(pdev));
 
        netdev->irq = pdev->irq;
 
        pci_set_drvdata(pdev, netdev);
+#ifdef HAVE_PCI_ERS
+       /* PCI config space info */
+       err = pci_save_state(pdev);
+       if (err)
+               goto err_ioremap;
+#endif /* HAVE_PCI_ERS */
        adapter = netdev_priv(netdev);
        hw = &adapter->hw;
+       adapter->node = -1;
        adapter->netdev = netdev;
        adapter->pdev = pdev;
        adapter->ei = ei;
@@ -6140,7 +7137,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        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;
+       adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
 
        mmio_start = pci_resource_start(pdev, 0);
        mmio_len = pci_resource_len(pdev, 0);
@@ -6160,10 +7157,35 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        }
 
        /* construct the net_device struct */
-       netdev->netdev_ops              = &e1000e_netdev_ops;
+#ifdef HAVE_NET_DEVICE_OPS
+       netdev->netdev_ops = &e1000e_netdev_ops;
+#else
+       netdev->open = &e1000_open;
+       netdev->stop = &e1000_close;
+       netdev->hard_start_xmit = &e1000_xmit_frame;
+       netdev->get_stats = &e1000_get_stats;
+#ifdef HAVE_SET_RX_MODE
+       netdev->set_rx_mode = &e1000e_set_rx_mode;
+#endif
+       netdev->set_multicast_list = &e1000e_set_rx_mode;
+       netdev->set_mac_address = &e1000_set_mac;
+       netdev->change_mtu = &e1000_change_mtu;
+       netdev->do_ioctl = &e1000_ioctl;
+       netdev->tx_timeout = &e1000_tx_timeout;
+#ifdef NETIF_F_HW_VLAN_TX
+       netdev->vlan_rx_register = e1000_vlan_rx_register;
+       netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
+       netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       netdev->poll_controller = e1000_netpoll;
+#endif
+#endif /* HAVE_NET_DEVICE_OPS */
        e1000e_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo          = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+       netdev->watchdog_timeo = 5 * HZ;
+#ifdef CONFIG_E1000E_NAPI
+       netif_napi_add(netdev, &adapter->napi, e1000e_poll, 64);
+#endif
        strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
        netdev->mem_start = mmio_start;
@@ -6173,22 +7195,21 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
        e1000e_check_options(adapter);
 
+       if (adapter->node >= 0)
+               dev_info(pci_dev_to_dev(pdev),
+                        "Using NUMA node %d for memory allocations\n",
+                        adapter->node);
+
        /* 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);
+       if (ei->get_variants) {
+               err = ei->get_variants(adapter);
+               if (err)
+                       goto err_hw_init;
+       }
 
        hw->mac.ops.get_bus_info(&adapter->hw);
 
@@ -6201,35 +7222,68 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                adapter->hw.phy.ms_type = e1000_ms_hw_default;
        }
 
-       if (e1000_check_reset_block(&adapter->hw))
+       if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                e_info("PHY reset is blocked due to SOL/IDER session.\n");
 
        /* Set initial default active device features */
        netdev->features = (NETIF_F_SG |
-                           NETIF_F_HW_VLAN_RX |
-                           NETIF_F_HW_VLAN_TX |
+#ifdef NETIF_F_HW_VLAN_TX
+                           NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
+#endif
+#ifdef NETIF_F_TSO
                            NETIF_F_TSO |
+#ifdef NETIF_F_TSO6
                            NETIF_F_TSO6 |
+#endif
+#endif
+#if defined(NETIF_F_RXHASH) && defined(HAVE_NDO_SET_FEATURES)
                            NETIF_F_RXHASH |
+#endif
+#ifdef NETIF_F_RXCSUM
                            NETIF_F_RXCSUM |
+#endif
                            NETIF_F_HW_CSUM);
 
+#ifdef HAVE_NDO_SET_FEATURES
        /* Set user-changeable features (subset of all device features) */
        netdev->hw_features = netdev->features;
+       netdev->hw_features |= NETIF_F_RXFCS;
+#ifdef IFF_SUPP_NOFCS
+       netdev->priv_flags |= IFF_SUPP_NOFCS;
+#endif /* IFF_SUPP_NOFCS */
+       netdev->hw_features |= NETIF_F_RXALL;
+#else /* HAVE_NDO_SET_FEATURES */
+#ifdef NETIF_F_GRO
+       /* only needed for <2.6.39; otherwise set in register_netdevice() */
+       netdev->features |= NETIF_F_GRO;
+#endif
+#endif /* HAVE_NDO_SET_FEATURES */
 
+#ifdef NETIF_F_HW_VLAN_FILTER
        if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
                netdev->features |= NETIF_F_HW_VLAN_FILTER;
 
+#endif /* NETIF_F_HW_VLAN_FILTER */
+#ifdef HAVE_NETDEV_VLAN_FEATURES
        netdev->vlan_features |= (NETIF_F_SG |
+#ifdef NETIF_F_TSO
                                  NETIF_F_TSO |
+#endif
+#ifdef NETIF_F_TSO6
                                  NETIF_F_TSO6 |
+#endif
                                  NETIF_F_HW_CSUM);
 
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
+#ifdef IFF_UNICAST_FLT
        netdev->priv_flags |= IFF_UNICAST_FLT;
 
+#endif /* IFF_UNICAST_FLT */
        if (pci_using_dac) {
                netdev->features |= NETIF_F_HIGHDMA;
+#ifdef HAVE_NETDEV_VLAN_FEATURES
                netdev->vlan_features |= NETIF_F_HIGHDMA;
+#endif /* HAVE_NETDEV_VLAN_FEATURES */
        }
 
        if (e1000e_enable_mng_pass_thru(&adapter->hw))
@@ -6262,27 +7316,37 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                e_err("NVM Read Error while reading MAC address\n");
 
        memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
+#ifdef ETHTOOL_GPERMADDR
        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);
+#else
+       if (!is_valid_ether_addr(netdev->dev_addr)) {
+#endif
+               e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\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]);
                err = -EIO;
                goto err_eeprom;
        }
 
        init_timer(&adapter->watchdog_timer);
        adapter->watchdog_timer.function = e1000_watchdog;
-       adapter->watchdog_timer.data = (unsigned long) adapter;
+       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;
+       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);
+#ifndef HAVE_ETHTOOL_SET_PHYS_ID
+       INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
+#endif
 
        /* Initialize link parameters. User can change them with ethtool */
        adapter->hw.mac.autoneg = 1;
@@ -6309,11 +7373,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        } 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);
+                       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);
+                       e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_A,
+                                      1, &eeprom_data);
        }
 
        /* fetch WoL from EEPROM */
@@ -6330,7 +7394,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
        /* initialize the wol settings based on the eeprom settings */
        adapter->wol = adapter->eeprom_wol;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+       device_set_wakeup_enable(pci_dev_to_dev(adapter->pdev), adapter->wol);
 
        /* save off EEPROM version number */
        e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
@@ -6365,7 +7429,7 @@ err_register:
        if (!(adapter->flags & FLAG_HAS_AMT))
                e1000e_release_hw_control(adapter);
 err_eeprom:
-       if (!e1000_check_reset_block(&adapter->hw))
+       if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw))
                e1000_phy_hw_reset(&adapter->hw);
 err_hw_init:
        kfree(adapter->tx_ring);
@@ -6380,7 +7444,7 @@ err_ioremap:
        free_netdev(netdev);
 err_alloc_etherdev:
        pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
 err_pci_reg:
 err_dma:
        pci_disable_device(pdev);
@@ -6415,6 +7479,9 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
        cancel_work_sync(&adapter->watchdog_task);
        cancel_work_sync(&adapter->downshift_task);
        cancel_work_sync(&adapter->update_phy_task);
+#ifndef HAVE_ETHTOOL_SET_PHYS_ID
+       cancel_work_sync(&adapter->led_blink_task);
+#endif
        cancel_work_sync(&adapter->print_hang_task);
 
        if (!(netdev->flags & IFF_UP))
@@ -6442,7 +7509,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
        if (adapter->hw.flash_address)
                iounmap(adapter->hw.flash_address);
        pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
 
        free_netdev(netdev);
 
@@ -6452,106 +7519,117 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
        pci_disable_device(pdev);
 }
 
+#ifdef HAVE_PCI_ERS
 /* 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,
 };
+#endif
 
-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 },
-
-       { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
+static DEFINE_PCI_DEVICE_TABLE(e1000e_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}, {
+       PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM), board_pch_lpt}, {
+       PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V), board_pch_lpt}, {
+       0, 0, 0, 0, 0, 0, 0}    /* terminate list */
 };
-MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
+
+MODULE_DEVICE_TABLE(pci, e1000e_pci_tbl);
 
 #ifdef CONFIG_PM
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
 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)
+           SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
+                              e1000_runtime_resume, e1000_idle)
 };
+#endif /* HAVE_SYSTEM_SLEEP_PM_OPS */
 #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),
+       .name = e1000e_driver_name,
+       .id_table = e1000e_pci_tbl,
+       .probe = e1000_probe,
+       .remove = __devexit_p(e1000_remove),
 #ifdef CONFIG_PM
-       .driver   = {
-               .pm = &e1000_pm_ops,
-       },
+#ifdef HAVE_SYSTEM_SLEEP_PM_OPS
+       .driver = {
+                  .pm = &e1000_pm_ops,
+                  },
+#elif defined(CONFIG_PM_SLEEP)
+       .suspend = e1000_suspend,
+       .resume = e1000_resume,
+#endif /* HAVE_SYSTEM_SLEEP_PM_OPS */
 #endif
+#ifndef USE_REBOOT_NOTIFIER
        .shutdown = e1000_shutdown,
+#endif
+#ifdef HAVE_PCI_ERS
        .err_handler = &e1000_err_handler
+#endif
 };
 
 /**
@@ -6567,9 +7645,14 @@ static int __init e1000_init_module(void)
                e1000e_driver_version);
        pr_info("Copyright(c) 1999 - 2012 Intel Corporation.\n");
        ret = pci_register_driver(&e1000_driver);
+#ifdef USE_REBOOT_NOTIFIER
+       if (ret >= 0)
+               register_reboot_notifier(&e1000_notifier_reboot);
+#endif
 
        return ret;
 }
+
 module_init(e1000_init_module);
 
 /**
@@ -6580,14 +7663,17 @@ module_init(e1000_init_module);
  **/
 static void __exit e1000_exit_module(void)
 {
+#ifdef USE_REBOOT_NOTIFIER
+       unregister_reboot_notifier(&e1000_notifier_reboot);
+#endif
        pci_unregister_driver(&e1000_driver);
 }
-module_exit(e1000_exit_module);
 
+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 */
+/* netdev.c */
index 24b7930b75000c37fac4610a9c72531da43b65b9..868654409b8fffc29a8bb928c5fd75dc8c4b588f 100644 (file)
 
 #include "e1000.h"
 
+static void e1000e_reload_nvm_generic(struct e1000_hw *hw);
+
+/**
+ *  e1000_init_nvm_ops_generic - Initialize NVM function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Setups up the function pointers to no-op functions
+ **/
+void e1000_init_nvm_ops_generic(struct e1000_hw *hw)
+{
+       struct e1000_nvm_info *nvm = &hw->nvm;
+       /* Initialize function pointers */
+       nvm->ops.reload = e1000e_reload_nvm_generic;
+}
+
 /**
  *  e1000_raise_eec_clk - Raise EEPROM clock
  *  @hw: pointer to the HW structure
@@ -117,7 +132,6 @@ static u16 e1000_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
        u16 data;
 
        eecd = er32(EECD);
-
        eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
        data = 0;
 
@@ -180,7 +194,6 @@ s32 e1000e_acquire_nvm(struct e1000_hw *hw)
 
        ew32(EECD, eecd | E1000_EECD_REQ);
        eecd = er32(EECD);
-
        while (timeout) {
                if (eecd & E1000_EECD_GNT)
                        break;
@@ -625,13 +638,13 @@ s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
 }
 
 /**
- *  e1000e_reload_nvm - Reloads EEPROM
+ *  e1000e_reload_nvm_generic - Reloads EEPROM
  *  @hw: pointer to the HW structure
  *
  *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
  *  extended control register.
  **/
-void e1000e_reload_nvm(struct e1000_hw *hw)
+static void e1000e_reload_nvm_generic(struct e1000_hw *hw)
 {
        u32 ctrl_ext;
 
diff --git a/drivers/net/e1000e/nvm.h b/drivers/net/e1000e/nvm.h
new file mode 100644 (file)
index 0000000..65a858a
--- /dev/null
@@ -0,0 +1,47 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_NVM_H_
+#define _E1000_NVM_H_
+
+void e1000_init_nvm_ops_generic(struct e1000_hw *hw);
+s32 e1000e_acquire_nvm(struct e1000_hw *hw);
+
+s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
+s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);
+s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
+                                 u32 pba_num_size);
+s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);
+s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
+s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
+void e1000e_release_nvm(struct e1000_hw *hw);
+
+#define E1000_STM_OPCODE       0xDB00
+#endif
index 0da2e519477d7080a3ddb8deb013d832776ba544..2711cf9bd6b64bc39ab38efca67168d0b65cf7a8 100644 (file)
@@ -47,7 +47,7 @@
 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");
+                "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.
@@ -56,12 +56,29 @@ MODULE_PARM_DESC(copybreak,
  */
 
 #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+#ifndef module_param_array
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when e1000e_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+#define E1000_PARAM(X, desc) \
+       static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+       static unsigned int num_##X;                             \
+       MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \
+       MODULE_PARM_DESC(X, desc);
+#else
 #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);
+#endif
 
 /*
  * Transmit Interrupt Delay in units of 1.024 microseconds
@@ -106,7 +123,7 @@ E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
 /*
  * Interrupt Throttle Rate (interrupts/sec)
  *
- * Valid Range: 100-100000 or one of: 0=off, 1=dynamic, 3=dynamic conservative
+ * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
  */
 E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define DEFAULT_ITR 3
@@ -151,23 +168,34 @@ E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
 E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
 
 /*
- * Write Protect NVM
+ * Enable CRC Stripping
  *
  * Valid Range: 0, 1
  *
  * Default Value: 1 (enabled)
  */
-E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
+E1000_PARAM(CrcStripping,
+           "Enable CRC Stripping, disable if your BMC needs the CRC");
 
 /*
- * Enable CRC Stripping
+ * Enable/disable EEE (a.k.a. IEEE802.3az)
  *
  * Valid Range: 0, 1
  *
- * Default Value: 1 (enabled)
+ * Default Value: 1
  */
-E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
-                          "the CRC");
+E1000_PARAM(EEE, "Enable/disable on parts that support the feature");
+
+/* Enable node specific allocation of all data structures, typically
+ *  specific to routing setups, not generally useful.
+ *
+ *  Depends on: NUMA configuration
+ *
+ * Valid Range: -1, 0-32768
+ *
+ * Default Value: -1 (disabled, default to kernel choice of node)
+ */
+E1000_PARAM(Node, "[ROUTING] Node to allocate memory on, default -1");
 
 struct e1000_option {
        enum { enable_option, range_option, list_option } type;
@@ -175,13 +203,16 @@ struct e1000_option {
        const char *err;
        int def;
        union {
-               struct { /* range_option info */
+               struct {        /* range_option info */
                        int min;
                        int max;
                } r;
-               struct { /* list_option info */
+               struct {        /* list_option info */
                        int nr;
-                       struct e1000_opt_list { int i; char *str; } *p;
+                       struct e1000_opt_list {
+                               int i;
+                               char *str;
+                       } *p;
                } l;
        } arg;
 };
@@ -212,19 +243,19 @@ static int __devinit e1000_validate_option(unsigned int *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;
+       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();
@@ -255,7 +286,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                e_notice("Using defaults for all values\n");
        }
 
-       { /* Transmit Interrupt Delay */
+       {                       /* Transmit Interrupt Delay */
+/* *INDENT-OFF* */
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Transmit Interrupt Delay",
@@ -265,6 +297,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        .arg  = { .r = { .min = MIN_TXDELAY,
                                         .max = MAX_TXDELAY } }
                };
+/* *INDENT-ON* */
 
                if (num_TxIntDelay > bd) {
                        adapter->tx_int_delay = TxIntDelay[bd];
@@ -274,7 +307,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->tx_int_delay = opt.def;
                }
        }
-       { /* Transmit Absolute Interrupt Delay */
+       {                       /* Transmit Absolute Interrupt Delay */
+/* *INDENT-OFF* */
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Transmit Absolute Interrupt Delay",
@@ -284,6 +318,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        .arg  = { .r = { .min = MIN_TXABSDELAY,
                                         .max = MAX_TXABSDELAY } }
                };
+/* *INDENT-ON* */
 
                if (num_TxAbsIntDelay > bd) {
                        adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
@@ -293,7 +328,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->tx_abs_int_delay = opt.def;
                }
        }
-       { /* Receive Interrupt Delay */
+       {                       /* Receive Interrupt Delay */
+/* *INDENT-OFF* */
                static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Interrupt Delay",
@@ -303,6 +339,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        .arg  = { .r = { .min = MIN_RXDELAY,
                                         .max = MAX_RXDELAY } }
                };
+/* *INDENT-ON* */
 
                if (num_RxIntDelay > bd) {
                        adapter->rx_int_delay = RxIntDelay[bd];
@@ -312,7 +349,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->rx_int_delay = opt.def;
                }
        }
-       { /* Receive Absolute Interrupt Delay */
+       {                       /* Receive Absolute Interrupt Delay */
+/* *INDENT-OFF* */
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Absolute Interrupt Delay",
@@ -322,6 +360,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        .arg  = { .r = { .min = MIN_RXABSDELAY,
                                         .max = MAX_RXABSDELAY } }
                };
+/* *INDENT-ON* */
 
                if (num_RxAbsIntDelay > bd) {
                        adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
@@ -331,7 +370,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->rx_abs_int_delay = opt.def;
                }
        }
-       { /* Interrupt Throttling Rate */
+       {                       /* Interrupt Throttling Rate */
+/* *INDENT-OFF* */
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Interrupt Throttling Rate (ints/sec)",
@@ -341,74 +381,70 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        .arg  = { .r = { .min = MIN_ITR,
                                         .max = MAX_ITR } }
                };
+/* *INDENT-ON* */
 
                if (num_InterruptThrottleRate > bd) {
                        adapter->itr = InterruptThrottleRate[bd];
-
-                       /*
-                        * Make sure a message is printed for non-special
-                        * values.  And in case of an invalid option, display
-                        * warning, use default and got through itr/itr_setting
-                        * adjustment logic below
-                        */
-                       if ((adapter->itr > 4) &&
-                           e1000_validate_option(&adapter->itr, &opt, adapter))
-                               adapter->itr = opt.def;
+                       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 {
-                       /*
-                        * If no option specified, use default value and go
-                        * through the logic below to adjust itr/itr_setting
-                        */
-                       adapter->itr = opt.def;
-
-                       /*
-                        * Make sure a message is printed for non-special
-                        * default values
-                        */
-                       if (adapter->itr > 40)
-                               e_info("%s set to default %d\n", opt.name,
-                                      adapter->itr);
-               }
-
-               adapter->itr_setting = adapter->itr;
-               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 = opt.def;
                        adapter->itr = 20000;
-                       break;
-               case 3:
-                       e_info("%s set to dynamic conservative mode\n",
-                              opt.name);
-                       adapter->itr = 20000;
-                       break;
-               case 4:
-                       e_info("%s set to simplified (2000-8000 ints) mode\n",
-                              opt.name);
-                       break;
-               default:
-                       /*
-                        * Save the setting, because the dynamic bits
-                        * change itr.
-                        *
-                        * Clear the lower two bits because
-                        * they are used as control.
-                        */
-                       adapter->itr_setting &= ~3;
-                       break;
                }
        }
-       { /* Interrupt Mode */
+       {                       /* Interrupt Mode */
                static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Interrupt Mode",
 #ifndef CONFIG_PCI_MSI
+/* *INDENT-OFF* */
                        .err  = "defaulting to 0 (legacy)",
                        .def  = E1000E_INT_MODE_LEGACY,
                        .arg  = { .r = { .min = 0,
                                         .max = 0 } }
+/* *INDENT-ON* */
 #endif
                };
 
@@ -425,7 +461,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                }
 
                if (!opt.err) {
-                       dev_err(&adapter->pdev->dev,
+                       dev_err(pci_dev_to_dev(adapter->pdev),
                                "Failed to allocate memory\n");
                        return;
                }
@@ -443,12 +479,12 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                kfree(opt.err);
 #endif
        }
-       { /* Smart Power Down */
+       {                       /* Smart Power Down */
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "PHY Smart Power Down",
-                       .err  = "defaulting to Disabled",
-                       .def  = OPTION_DISABLED
+                       .err = "defaulting to Disabled",
+                       .def = OPTION_DISABLED
                };
 
                if (num_SmartPowerDownEnable > bd) {
@@ -459,29 +495,32 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                                adapter->flags |= FLAG_SMART_POWER_DOWN;
                }
        }
-       { /* CRC Stripping */
+       {                       /* CRC Stripping */
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "CRC Stripping",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
+                       .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)
+                       if (crc_stripping == OPTION_ENABLED) {
                                adapter->flags2 |= FLAG2_CRC_STRIPPING;
+                               adapter->flags2 |= FLAG2_DFLT_CRC_STRIPPING;
+                       }
                } else {
                        adapter->flags2 |= FLAG2_CRC_STRIPPING;
+                       adapter->flags2 |= FLAG2_DFLT_CRC_STRIPPING;
                }
        }
-       { /* Kumeran Lock Loss Workaround */
+       {                       /* 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
+                       .err = "defaulting to Enabled",
+                       .def = OPTION_ENABLED
                };
 
                if (num_KumeranLockLoss > bd) {
@@ -489,32 +528,72 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        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);
+                                                                            kmrn_lock_loss);
                } else {
                        if (hw->mac.type == e1000_ich8lan)
                                e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                                      opt.def);
+                                                                            opt.
+                                                                            def);
                }
        }
-       { /* Write-protect NVM */
+       {                       /* EEE for parts supporting the feature */
                static const struct e1000_option opt = {
                        .type = enable_option,
-                       .name = "Write-protect NVM",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
+                       .name = "EEE Support",
+                       .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;
+               if (adapter->flags2 & FLAG2_HAS_EEE) {
+                       /* Currently only supported on 82579 */
+                       if (num_EEE > bd) {
+                               unsigned int eee = EEE[bd];
+                               e1000_validate_option(&eee, &opt, adapter);
+                               hw->dev_spec.ich8lan.eee_disable = !eee;
                        } else {
-                               if (opt.def)
-                                       adapter->flags |= FLAG_READ_ONLY_NVM;
+                               hw->dev_spec.ich8lan.eee_disable = !opt.def;
                        }
                }
        }
+       {                       /* configure node specific allocation */
+/* *INDENT-OFF* */
+               static struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Node used to allocate memory",
+                       .err  = "defaulting to -1 (disabled)",
+#ifdef HAVE_EARLY_VMALLOC_NODE
+                       .def  = 0,
+#else
+                       .def  = -1,
+#endif
+                       .arg  = { .r = { .min = 0,
+                                        .max = MAX_NUMNODES - 1 } }
+               };
+/* *INDENT-ON* */
+               int node = opt.def;
+
+               /* if the default was zero then we need to set the
+                * default value to an online node, which is not
+                * necessarily zero, and the constant initializer
+                * above can't take first_online_node */
+               if (node == 0)
+                       /* must set opt.def for validate */
+                       opt.def = node = first_online_node;
+
+               if (num_Node > bd) {
+                       node = Node[bd];
+                       e1000_validate_option((unsigned int *)&node, &opt,
+                                             adapter);
+                       if (node != OPTION_UNSET)
+                               e_info("node used for allocation: %d\n", node);
+               }
+
+               /* check sanity of the value */
+               if ((node != -1) && !node_online(node)) {
+                       e_info("ignoring node set to invalid value %d\n", node);
+                       node = opt.def;
+               }
+
+               adapter->node = node;
+       }
 }
index d2cc188b35eb0fc8d5112df17d9a3131145e9b5b..24e2749a577dba7273782416f696ac34881935f3 100644 (file)
 
 #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 s32 e1000_phy_setup_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);
+                                         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 };
+       0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED
+};
+
 #define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-               ARRAY_SIZE(e1000_m88_cable_length_table)
+               (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,
@@ -53,50 +53,12 @@ static const u16 e1000_igp_2_cable_length_table[] = {
        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};
+       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
+               (sizeof(e1000_igp_2_cable_length_table) / \
+                sizeof(e1000_igp_2_cable_length_table[0]))
 
 /**
  *  e1000e_check_reset_block_generic - Check if PHY reset is blocked
@@ -112,8 +74,7 @@ s32 e1000e_check_reset_block_generic(struct e1000_hw *hw)
 
        manc = er32(MANC);
 
-       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-              E1000_BLK_PHY_RESET : 0;
+       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ? E1000_BLK_PHY_RESET : 0;
 }
 
 /**
@@ -198,8 +159,7 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
         * PHY to retrieve the desired data.
         */
        mdic = ((offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_READ));
+               (phy->addr << E1000_MDIC_PHY_SHIFT) | (E1000_MDIC_OP_READ));
 
        ew32(MDIC, mdic);
 
@@ -222,7 +182,7 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
                e_dbg("MDI Error\n");
                return -E1000_ERR_PHY;
        }
-       *data = (u16) mdic;
+       *data = (u16)mdic;
 
        /*
         * Allow some time after each MDIC transaction to avoid
@@ -259,8 +219,7 @@ s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
         */
        mdic = (((u32)data) |
                (offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_WRITE));
+               (phy->addr << E1000_MDIC_PHY_SHIFT) | (E1000_MDIC_OP_WRITE));
 
        ew32(MDIC, mdic);
 
@@ -375,7 +334,7 @@ s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page)
  *  semaphores before exiting.
  **/
 static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
-                                    bool locked)
+                                    bool locked)
 {
        s32 ret_val = 0;
 
@@ -442,7 +401,7 @@ s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  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)
+                                     bool locked)
 {
        s32 ret_val = 0;
 
@@ -461,8 +420,7 @@ static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
                                                    (u16)offset);
        if (!ret_val)
                ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS &
-                                                       offset,
-                                                   data);
+                                                   offset, data);
        if (!locked)
                hw->phy.ops.release(hw);
 
@@ -509,7 +467,7 @@ s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
  *  Release any acquired semaphores before exiting.
  **/
 static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
+                                bool locked)
 {
        u32 kmrnctrlsta;
 
@@ -582,7 +540,7 @@ s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
  *  before exiting.
  **/
 static s32 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
+                                 bool locked)
 {
        u32 kmrnctrlsta;
 
@@ -638,6 +596,45 @@ s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
        return __e1000_write_kmrn_reg(hw, offset, data, true);
 }
 
+/**
+ *  e1000_set_master_slave_mode - Setup PHY for Master/slave mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Master/slave mode
+ **/
+static s32 e1000_set_master_slave_mode(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       /* Resolve Master/Slave mode */
+       ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* load defaults for future use */
+       hw->phy.original_ms_type = (phy_data & CR_1000T_MS_ENABLE) ?
+           ((phy_data & CR_1000T_MS_VALUE) ?
+            e1000_ms_force_master : e1000_ms_force_slave) : e1000_ms_auto;
+
+       switch (hw->phy.ms_type) {
+       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;
+               /* fall-through */
+       default:
+               break;
+       }
+
+       return e1e_wphy(hw, PHY_1000T_CTRL, phy_data);
+}
+
 /**
  *  e1000_copper_link_setup_82577 - Setup 82577 PHY for copper link
  *  @hw: pointer to the HW structure
@@ -659,7 +656,11 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
        /* Enable downshift */
        phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
 
-       return e1e_wphy(hw, I82577_CFG_REG, phy_data);
+       ret_val = e1e_wphy(hw, I82577_CFG_REG, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       return e1000_set_master_slave_mode(hw);
 }
 
 /**
@@ -718,12 +719,28 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
         *   1 - Enabled
         */
        phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
+       if (phy->disable_polarity_correction)
                phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
 
        /* Enable downshift on BM (disabled by default) */
-       if (phy->type == e1000_phy_bm)
+       if (phy->type == e1000_phy_bm) {
+               /* For 82574/82583, first disable then enable downshift */
+               if (phy->id == BME1000_E_PHY_ID_R2) {
+                       phy_data &= ~BME1000_PSCR_ENABLE_DOWNSHIFT;
+                       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL,
+                                          phy_data);
+                       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;
+                       }
+               }
+
                phy_data |= BME1000_PSCR_ENABLE_DOWNSHIFT;
+       }
 
        ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
        if (ret_val)
@@ -742,8 +759,7 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
 
                phy_data |= M88E1000_EPSCR_TX_CLK_25;
 
-               if ((phy->revision == 2) &&
-                   (phy->id == M88E1111_I_PHY_ID)) {
+               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;
@@ -820,10 +836,12 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
        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;
+       if (hw->phy.ops.set_d0_lplu_state) {
+               ret_val = hw->phy.ops.set_d0_lplu_state(hw, false);
+               if (ret_val) {
+                       e_dbg("Error Disabling LPLU D0\n");
+                       return ret_val;
+               }
        }
        /* Configure mdi-mdix settings */
        ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &data);
@@ -857,14 +875,14 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
                 */
                if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
                        /* Disable SmartSpeed */
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
+                       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);
+                       ret_val = e1e_wphy(hw,
+                                          IGP01E1000_PHY_PORT_CONFIG, data);
                        if (ret_val)
                                return ret_val;
 
@@ -879,31 +897,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
                                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);
+               ret_val = e1000_set_master_slave_mode(hw);
        }
 
        return ret_val;
@@ -954,8 +948,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
         */
        mii_autoneg_adv_reg &= ~(NWAY_AR_100TX_FD_CAPS |
                                 NWAY_AR_100TX_HD_CAPS |
-                                NWAY_AR_10T_FD_CAPS   |
-                                NWAY_AR_10T_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);
@@ -1005,12 +998,12 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
         * 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).
+        *          but not send pause frames).
         *      2:  Tx flow control is enabled (we can send pause frames
-        *        but we do not support receiving 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.
+        *          in the EEPROM is used.
         */
        switch (hw->fc.current_mode) {
        case e1000_fc_none:
@@ -1090,7 +1083,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         * 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)
+       if (!phy->autoneg_advertised)
                phy->autoneg_advertised = phy->autoneg_mask;
 
        e_dbg("Reconfiguring auto-neg advertisement params\n");
@@ -1119,7 +1112,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         * check at a later time (for example, callback routine).
         */
        if (phy->autoneg_wait_to_complete) {
-               ret_val = e1000_wait_autoneg(hw);
+               ret_val = hw->mac.ops.wait_autoneg(hw);
                if (ret_val) {
                        e_dbg("Error while waiting for autoneg to complete\n");
                        return ret_val;
@@ -1159,7 +1152,7 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
                 * depending on user settings.
                 */
                e_dbg("Forcing Speed and Duplex\n");
-               ret_val = e1000_phy_force_speed_duplex(hw);
+               ret_val = hw->phy.ops.force_speed_duplex(hw);
                if (ret_val) {
                        e_dbg("Error Forcing Speed and Duplex\n");
                        return ret_val;
@@ -1170,16 +1163,14 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
         * 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);
+       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);
+               hw->mac.ops.config_collision_dist(hw);
                ret_val = e1000e_config_fc_after_link_up(hw);
        } else {
                e_dbg("Unable to establish link!!!\n");
@@ -1235,10 +1226,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
        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);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
 
@@ -1246,10 +1235,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
                        e_dbg("Link taking longer than expected.\n");
 
                /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
        }
 
        return ret_val;
@@ -1306,7 +1293,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                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);
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
 
@@ -1318,7 +1305,8 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
                                 * We didn't get link.
                                 * Reset the DSP and cross our fingers.
                                 */
-                               ret_val = e1e_wphy(hw, M88E1000_PHY_PAGE_SELECT,
+                               ret_val = e1e_wphy(hw,
+                                                  M88E1000_PHY_PAGE_SELECT,
                                                   0x001d);
                                if (ret_val)
                                        return ret_val;
@@ -1330,7 +1318,7 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
                /* Try once more */
                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
        }
@@ -1410,10 +1398,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
        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);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
 
@@ -1421,10 +1407,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
                        e_dbg("Link taking longer than expected.\n");
 
                /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
        }
@@ -1487,7 +1471,7 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
                e_dbg("Forcing 10mb\n");
        }
 
-       e1000e_config_collision_dist(hw);
+       hw->mac.ops.config_collision_dist(hw);
 
        ew32(CTRL, ctrl);
 }
@@ -1528,25 +1512,25 @@ s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active)
                 * SmartSpeed, so performance is maintained.
                 */
                if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
+                       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);
+                       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);
+                       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);
+                       ret_val = e1e_wphy(hw,
+                                          IGP01E1000_PHY_PORT_CONFIG, data);
                        if (ret_val)
                                return ret_val;
                }
@@ -1589,13 +1573,13 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
        case e1000_phy_gg82563:
        case e1000_phy_bm:
        case e1000_phy_82578:
-               offset  = M88E1000_PHY_SPEC_STATUS;
-               mask    = M88E1000_PSSR_DOWNSHIFT;
+               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;
+               offset = IGP01E1000_PHY_LINK_HEALTH;
+               mask = IGP01E1000_PLHR_SS_DOWNGRADE;
                break;
        default:
                /* speed downshift not supported */
@@ -1606,7 +1590,7 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
        ret_val = e1e_rphy(hw, offset, &phy_data);
 
        if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask);
+               phy->speed_downgraded = !!(phy_data & mask);
 
        return ret_val;
 }
@@ -1629,8 +1613,7 @@ s32 e1000_check_polarity_m88(struct e1000_hw *hw)
 
        if (!ret_val)
                phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+                   ? e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
 
        return ret_val;
 }
@@ -1660,23 +1643,22 @@ s32 e1000_check_polarity_igp(struct e1000_hw *hw)
 
        if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
            IGP01E1000_PSSR_SPEED_1000MBPS) {
-               offset  = IGP01E1000_PHY_PCS_INIT_REG;
-               mask    = IGP01E1000_PHY_POLARITY_MASK;
+               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;
+               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;
+                   ? e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
 
        return ret_val;
 }
@@ -1708,8 +1690,7 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
 
        if (!ret_val)
                phy->cable_polarity = (phy_data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
+                   ? e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
 
        return ret_val;
 }
@@ -1721,7 +1702,7 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
  *  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 e1000_wait_autoneg(struct e1000_hw *hw)
 {
        s32 ret_val = 0;
        u16 i, phy_status;
@@ -1756,7 +1737,7 @@ static s32 e1000_wait_autoneg(struct e1000_hw *hw)
  *  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)
+                               u32 usec_interval, bool *success)
 {
        s32 ret_val = 0;
        u16 i, phy_status;
@@ -1781,7 +1762,7 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
                if (phy_status & MII_SR_LINK_STATUS)
                        break;
                if (usec_interval >= 1000)
-                       mdelay(usec_interval/1000);
+                       mdelay(usec_interval / 1000);
                else
                        udelay(usec_interval);
        }
@@ -1817,7 +1798,7 @@ s32 e1000e_get_cable_length_m88(struct e1000_hw *hw)
                return ret_val;
 
        index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-               M88E1000_PSSR_CABLE_LENGTH_SHIFT;
+           M88E1000_PSSR_CABLE_LENGTH_SHIFT;
 
        if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1)
                return -E1000_ERR_PHY;
@@ -1849,10 +1830,10 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
        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
+               IGP02E1000_PHY_AGC_A,
+               IGP02E1000_PHY_AGC_B,
+               IGP02E1000_PHY_AGC_C,
+               IGP02E1000_PHY_AGC_D
        };
 
        /* Read the AGC registers for all channels */
@@ -1868,7 +1849,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
                 * approximate cable length.
                 */
                cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                               IGP02E1000_AGC_LENGTH_MASK;
+                   IGP02E1000_AGC_LENGTH_MASK;
 
                /* Array index bound check. */
                if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
@@ -1892,7 +1873,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
 
        /* 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;
+           (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;
@@ -1913,7 +1894,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
 s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val;
+       s32 ret_val;
        u16 phy_data;
        bool link;
 
@@ -1935,8 +1916,8 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       phy->polarity_correction = (phy_data &
-                                   M88E1000_PSCR_POLARITY_REVERSAL);
+       phy->polarity_correction = !!(phy_data &
+                                     M88E1000_PSCR_POLARITY_REVERSAL);
 
        ret_val = e1000_check_polarity_m88(hw);
        if (ret_val)
@@ -1946,7 +1927,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX);
+       phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);
 
        if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
                ret_val = e1000_get_cable_length(hw);
@@ -1958,12 +1939,10 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
                        return ret_val;
 
                phy->local_rx = (phy_data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+                   ? 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;
+                   ? e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
        } else {
                /* Set values to "undefined" */
                phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
@@ -2009,11 +1988,11 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX);
+       phy->is_mdix = !!(data & IGP01E1000_PSSR_MDIX);
 
        if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
            IGP01E1000_PSSR_SPEED_1000MBPS) {
-               ret_val = e1000_get_cable_length(hw);
+               ret_val = phy->ops.get_cable_length(hw);
                if (ret_val)
                        return ret_val;
 
@@ -2022,12 +2001,10 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
                        return ret_val;
 
                phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+                   ? 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;
+                   ? 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;
@@ -2062,8 +2039,7 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
        ret_val = e1e_rphy(hw, IFE_PHY_SPECIAL_CONTROL, &data);
        if (ret_val)
                return ret_val;
-       phy->polarity_correction = (data & IFE_PSC_AUTO_POLARITY_DISABLE)
-                                  ? false : true;
+       phy->polarity_correction = !(data & IFE_PSC_AUTO_POLARITY_DISABLE);
 
        if (phy->polarity_correction) {
                ret_val = e1000_check_polarity_ife(hw);
@@ -2072,15 +2048,14 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
        } else {
                /* Polarity is forced */
                phy->cable_polarity = (data & IFE_PSC_FORCE_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+                   ? e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
        }
 
        ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &data);
        if (ret_val)
                return ret_val;
 
-       phy->is_mdix = (data & IFE_PMC_MDIX_STATUS) ? true : false;
+       phy->is_mdix = !!(data & IFE_PMC_MDIX_STATUS);
 
        /* The following parameters are undefined for 10/100 operation. */
        phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
@@ -2131,9 +2106,11 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
        s32 ret_val;
        u32 ctrl;
 
-       ret_val = e1000_check_reset_block(hw);
-       if (ret_val)
-               return 0;
+       if (phy->ops.check_reset_block) {
+               ret_val = phy->ops.check_reset_block(hw);
+               if (ret_val)
+                       return 0;
+       }
 
        ret_val = phy->ops.acquire(hw);
        if (ret_val)
@@ -2152,7 +2129,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
 
        phy->ops.release(hw);
 
-       return e1000_get_phy_cfg_done(hw);
+       return phy->ops.get_cfg_done(hw);
 }
 
 /**
@@ -2165,6 +2142,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
 s32 e1000e_get_cfg_done(struct e1000_hw *hw)
 {
        mdelay(10);
+
        return 0;
 }
 
@@ -2253,38 +2231,6 @@ s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)
        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
@@ -2302,7 +2248,7 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
        case M88E1011_I_PHY_ID:
                phy_type = e1000_phy_m88;
                break;
-       case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */
+       case IGP01E1000_I_PHY_ID:       /* IGP 1 & 2 share this */
                phy_type = e1000_phy_igp_2;
                break;
        case GG82563_E_PHY_ID:
@@ -2329,6 +2275,9 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
        case I82579_E_PHY_ID:
                phy_type = e1000_phy_82579;
                break;
+       case I217_E_PHY_ID:
+               phy_type = e1000_phy_i217;
+               break;
        default:
                phy_type = e1000_phy_unknown;
                break;
@@ -2364,7 +2313,7 @@ s32 e1000e_determine_phy_address(struct e1000_hw *hw)
                         * If phy_type is valid, break - we found our
                         * PHY address
                         */
-                       if (phy_type  != e1000_phy_unknown)
+                       if (phy_type != e1000_phy_unknown)
                                return 0;
 
                        usleep_range(1000, 2000);
@@ -2436,13 +2385,13 @@ s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
 
                /* Page is shifted left, PHY expects (page x 32) */
                ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                   (page << page_shift));
+                                                   (page << page_shift));
                if (ret_val)
                        goto release;
        }
 
        ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                           data);
+                                           data);
 
 release:
        hw->phy.ops.release(hw);
@@ -2495,13 +2444,13 @@ s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
 
                /* Page is shifted left, PHY expects (page x 32) */
                ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                   (page << page_shift));
+                                                   (page << page_shift));
                if (ret_val)
                        goto release;
        }
 
        ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
+                                          data);
 release:
        hw->phy.ops.release(hw);
        return ret_val;
@@ -2739,7 +2688,7 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
        if (read) {
                /* Read the Wakeup register page value using opcode 0x12 */
                ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
-                                                  data);
+                                                  data);
        } else {
                /* Write the Wakeup register page value using opcode 0x12 */
                ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
@@ -2794,43 +2743,6 @@ void e1000_power_down_phy_copper(struct e1000_hw *hw)
        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
@@ -2865,7 +2777,7 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
 
        if (page > 0 && page < HV_INTC_FC_PAGE_START) {
                ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                        data, true);
+                                                        data, true);
                goto out;
        }
 
@@ -2888,8 +2800,7 @@ static s32 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
        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);
+       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg, data);
 out:
        if (!locked)
                hw->phy.ops.release(hw);
@@ -2973,7 +2884,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
 
        if (page > 0 && page < HV_INTC_FC_PAGE_START) {
                ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                        &data, false);
+                                                        &data, false);
                goto out;
        }
 
@@ -2988,7 +2899,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
                if ((hw->phy.type == e1000_phy_82578) &&
                    (hw->phy.revision >= 1) &&
                    (hw->phy.addr == 2) &&
-                   ((MAX_PHY_REG_ADDRESS & reg) == 0) && (data & (1 << 11))) {
+                   !(MAX_PHY_REG_ADDRESS & reg) && (data & (1 << 11))) {
                        u16 data2 = 0x7EFF;
                        ret_val = e1000_access_phy_debug_regs_hv(hw,
                                                                 (1 << 6) | 0x3,
@@ -3013,7 +2924,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
              page << IGP_PAGE_SHIFT, reg);
 
        ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                         data);
+                                           data);
 
 out:
        if (!locked)
@@ -3091,7 +3002,7 @@ static u32 e1000_get_phy_addr_for_hv_page(u32 page)
  *  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)
+                                         u16 *data, bool read)
 {
        s32 ret_val;
        u32 addr_reg = 0;
@@ -3099,7 +3010,7 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
 
        /* 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;
+           I82578_ADDR_REG : I82577_ADDR_REG;
        data_reg = addr_reg + 1;
 
        /* All operations in this function are phy address 2 */
@@ -3153,19 +3064,18 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       data &= BM_CS_STATUS_LINK_UP |
-               BM_CS_STATUS_RESOLVED |
-               BM_CS_STATUS_SPEED_MASK;
+       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))
+       if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                    BM_CS_STATUS_SPEED_1000))
                return 0;
 
        msleep(200);
 
        /* flush the packets in the fifo buffer */
-       ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL, HV_MUX_DATA_CTRL_GEN_TO_MAC |
+       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)
                return ret_val;
@@ -3191,8 +3101,7 @@ s32 e1000_check_polarity_82577(struct e1000_hw *hw)
 
        if (!ret_val)
                phy->cable_polarity = (data & I82577_PHY_STATUS2_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
+                   ? e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
 
        return ret_val;
 }
@@ -3225,10 +3134,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
        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);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
                if (ret_val)
                        return ret_val;
 
@@ -3236,10 +3143,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
                        e_dbg("Link taking longer than expected.\n");
 
                /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                     100000, &link);
        }
 
        return ret_val;
@@ -3280,11 +3185,11 @@ s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       phy->is_mdix = (data & I82577_PHY_STATUS2_MDIX) ? true : false;
+       phy->is_mdix = !!(data & I82577_PHY_STATUS2_MDIX);
 
        if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
            I82577_PHY_STATUS2_SPEED_1000MBPS) {
-               ret_val = hw->phy.ops.get_cable_length(hw);
+               ret_val = e1000_get_cable_length(hw);
                if (ret_val)
                        return ret_val;
 
@@ -3293,12 +3198,10 @@ s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
                        return ret_val;
 
                phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
+                   ? 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;
+                   ? 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;
@@ -3326,7 +3229,7 @@ s32 e1000_get_cable_length_82577(struct e1000_hw *hw)
                return ret_val;
 
        length = (phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
-                I82577_DSTATUS_CABLE_LENGTH_SHIFT;
+           I82577_DSTATUS_CABLE_LENGTH_SHIFT;
 
        if (length == E1000_CABLE_LENGTH_UNDEFINED)
                ret_val = -E1000_ERR_PHY;
diff --git a/drivers/net/e1000e/phy.h b/drivers/net/e1000e/phy.h
new file mode 100644 (file)
index 0000000..5cfb24a
--- /dev/null
@@ -0,0 +1,287 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_PHY_H_
+#define _E1000_PHY_H_
+
+s32 e1000e_check_downshift(struct e1000_hw *hw);
+s32 e1000_check_polarity_m88(struct e1000_hw *hw);
+s32 e1000_check_polarity_igp(struct e1000_hw *hw);
+s32 e1000_check_polarity_ife(struct e1000_hw *hw);
+s32 e1000e_check_reset_block_generic(struct e1000_hw *hw);
+s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);
+s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw);
+s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
+s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);
+s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw);
+s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);
+s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);
+s32 e1000e_get_cfg_done(struct e1000_hw *hw);
+s32 e1000e_get_phy_id(struct e1000_hw *hw);
+s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);
+s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);
+s32 e1000_get_phy_info_ife(struct e1000_hw *hw);
+s32 e1000e_phy_sw_reset(struct e1000_hw *hw);
+void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
+s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw);
+s32 e1000e_phy_reset_dsp(struct e1000_hw *hw);
+s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page);
+s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);
+s32 e1000e_setup_copper_link(struct e1000_hw *hw);
+s32 e1000_wait_autoneg(struct e1000_hw *hw);
+s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000_phy_reset_dsp(struct e1000_hw *hw);
+s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
+                               u32 usec_interval, bool *success);
+s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw);
+enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
+s32 e1000e_determine_phy_address(struct e1000_hw *hw);
+s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg);
+s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg);
+s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);
+void e1000_power_up_phy_copper(struct e1000_hw *hw);
+void e1000_power_down_phy_copper(struct e1000_hw *hw);
+s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 data);
+s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);
+s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);
+s32 e1000_check_polarity_82577(struct e1000_hw *hw);
+s32 e1000_get_phy_info_82577(struct e1000_hw *hw);
+s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw);
+s32 e1000_get_cable_length_82577(struct e1000_hw *hw);
+
+#define E1000_MAX_PHY_ADDR             8
+
+/* IGP01E1000 Specific Registers */
+#define IGP01E1000_PHY_PORT_CONFIG     0x10    /* Port Config */
+#define IGP01E1000_PHY_PORT_STATUS     0x11    /* Status */
+#define IGP01E1000_PHY_PORT_CTRL       0x12    /* Control */
+#define IGP01E1000_PHY_LINK_HEALTH     0x13    /* PHY Link Health */
+#define IGP01E1000_GMII_FIFO           0x14    /* GMII FIFO */
+#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15    /* PHY Channel Quality */
+#define IGP02E1000_PHY_POWER_MGMT      0x19    /* Power Management */
+#define IGP01E1000_PHY_PAGE_SELECT     0x1F    /* Page Select */
+#define BM_PHY_PAGE_SELECT             22      /* Page Select for BM */
+#define IGP_PAGE_SHIFT                 5
+#define PHY_REG_MASK                   0x1F
+
+/* BM/HV Specific Registers */
+#define BM_PORT_CTRL_PAGE              769
+#define BM_PCIE_PAGE                   770
+#define BM_WUC_PAGE                    800
+#define BM_WUC_ADDRESS_OPCODE          0x11
+#define BM_WUC_DATA_OPCODE             0x12
+#define BM_WUC_ENABLE_PAGE             BM_PORT_CTRL_PAGE
+#define BM_WUC_ENABLE_REG              17
+#define BM_WUC_ENABLE_BIT              (1 << 2)
+#define BM_WUC_HOST_WU_BIT             (1 << 4)
+#define BM_WUC_ME_WU_BIT               (1 << 5)
+
+#define PHY_UPPER_SHIFT                        21
+#define BM_PHY_REG(page, reg) \
+       (((reg) & MAX_PHY_REG_ADDRESS) |\
+        (((page) & 0xFFFF) << PHY_PAGE_SHIFT) |\
+        (((reg) & ~MAX_PHY_REG_ADDRESS) << (PHY_UPPER_SHIFT - PHY_PAGE_SHIFT)))
+#define BM_PHY_REG_PAGE(offset) \
+       ((u16)(((offset) >> PHY_PAGE_SHIFT) & 0xFFFF))
+#define BM_PHY_REG_NUM(offset) \
+       ((u16)(((offset) & MAX_PHY_REG_ADDRESS) |\
+        (((offset) >> (PHY_UPPER_SHIFT - PHY_PAGE_SHIFT)) &\
+               ~MAX_PHY_REG_ADDRESS)))
+
+#define HV_INTC_FC_PAGE_START          768
+#define I82578_ADDR_REG                        29
+#define I82577_ADDR_REG                        16
+#define I82577_CFG_REG                 22
+#define I82577_CFG_ASSERT_CRS_ON_TX    (1 << 15)
+#define I82577_CFG_ENABLE_DOWNSHIFT    (3 << 10)       /* auto downshift 100/10 */
+#define I82577_CTRL_REG                        23
+
+/* 82577 specific PHY registers */
+#define I82577_PHY_CTRL_2              18
+#define I82577_PHY_LBK_CTRL            19
+#define I82577_PHY_STATUS_2            26
+#define I82577_PHY_DIAG_STATUS         31
+
+/* I82577 PHY Status 2 */
+#define I82577_PHY_STATUS2_REV_POLARITY                0x0400
+#define I82577_PHY_STATUS2_MDIX                        0x0800
+#define I82577_PHY_STATUS2_SPEED_MASK          0x0300
+#define I82577_PHY_STATUS2_SPEED_1000MBPS      0x0200
+#define I82577_PHY_STATUS2_SPEED_100MBPS       0x0100
+
+/* I82577 PHY Control 2 */
+#define I82577_PHY_CTRL2_AUTO_MDIX             0x0400
+#define I82577_PHY_CTRL2_FORCE_MDI_MDIX                0x0200
+
+/* I82577 PHY Diagnostics Status */
+#define I82577_DSTATUS_CABLE_LENGTH            0x03FC
+#define I82577_DSTATUS_CABLE_LENGTH_SHIFT      2
+
+/* 82580 PHY Power Management */
+#define E1000_82580_PHY_POWER_MGMT     0xE14
+#define E1000_82580_PM_SPD             0x0001  /* Smart Power Down */
+#define E1000_82580_PM_D0_LPLU         0x0002  /* For D0a states */
+#define E1000_82580_PM_D3_LPLU         0x0004  /* For all other states */
+
+/* BM PHY Copper Specific Control 1 */
+#define BM_CS_CTRL1                    16
+#define BM_CS_CTRL1_ENERGY_DETECT      0x0300  /* Enable Energy Detect */
+
+/* BM PHY Copper Specific Status */
+#define BM_CS_STATUS                   17
+#define BM_CS_STATUS_ENERGY_DETECT     0x0010  /* Energy Detect Status */
+#define BM_CS_STATUS_LINK_UP           0x0400
+#define BM_CS_STATUS_RESOLVED          0x0800
+#define BM_CS_STATUS_SPEED_MASK                0xC000
+#define BM_CS_STATUS_SPEED_1000                0x8000
+
+/* 82577 Mobile Phy Status Register */
+#define HV_M_STATUS                    26
+#define HV_M_STATUS_AUTONEG_COMPLETE   0x1000
+#define HV_M_STATUS_SPEED_MASK         0x0300
+#define HV_M_STATUS_SPEED_1000         0x0200
+#define HV_M_STATUS_LINK_UP            0x0040
+
+#define IGP01E1000_PHY_PCS_INIT_REG    0x00B4
+#define IGP01E1000_PHY_POLARITY_MASK   0x0078
+
+#define IGP01E1000_PSCR_AUTO_MDIX      0x1000
+#define IGP01E1000_PSCR_FORCE_MDI_MDIX 0x2000  /* 0=MDI, 1=MDIX */
+
+#define IGP01E1000_PSCFR_SMART_SPEED   0x0080
+
+/* Enable flexible speed on link-up */
+#define IGP01E1000_GMII_FLEX_SPD       0x0010
+#define IGP01E1000_GMII_SPD            0x0020  /* Enable SPD */
+
+#define IGP02E1000_PM_SPD              0x0001  /* Smart Power Down */
+#define IGP02E1000_PM_D0_LPLU          0x0002  /* For D0a states */
+#define IGP02E1000_PM_D3_LPLU          0x0004  /* For all other states */
+
+#define IGP01E1000_PLHR_SS_DOWNGRADE   0x8000
+
+#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
+#define IGP01E1000_PSSR_MDIX           0x0800
+#define IGP01E1000_PSSR_SPEED_MASK     0xC000
+#define IGP01E1000_PSSR_SPEED_1000MBPS 0xC000
+
+#define IGP02E1000_PHY_CHANNEL_NUM     4
+#define IGP02E1000_PHY_AGC_A           0x11B1
+#define IGP02E1000_PHY_AGC_B           0x12B1
+#define IGP02E1000_PHY_AGC_C           0x14B1
+#define IGP02E1000_PHY_AGC_D           0x18B1
+
+#define IGP02E1000_AGC_LENGTH_SHIFT    9       /* Course - 15:13, Fine - 12:9 */
+#define IGP02E1000_AGC_LENGTH_MASK     0x7F
+#define IGP02E1000_AGC_RANGE           15
+
+#define IGP03E1000_PHY_MISC_CTRL       0x1B
+#define IGP03E1000_PHY_MISC_DUPLEX_MANUAL_SET  0x1000  /* Manually Set Duplex */
+
+#define E1000_CABLE_LENGTH_UNDEFINED   0xFF
+
+#define E1000_KMRNCTRLSTA_OFFSET       0x001F0000
+#define E1000_KMRNCTRLSTA_OFFSET_SHIFT 16
+#define E1000_KMRNCTRLSTA_REN          0x00200000
+#define E1000_KMRNCTRLSTA_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
+#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN     0x0100
+
+/* IFE PHY Special Control and LED Control */
+#define IFE_PSCL_PROBE_MODE            0x0020
+#define IFE_PSCL_PROBE_LEDS_OFF                0x0006  /* Force LEDs 0 and 2 off */
+#define IFE_PSCL_PROBE_LEDS_ON         0x0007  /* Force LEDs 0 and 2 on */
+
+/* IFE PHY MDIX Control */
+#define IFE_PMC_MDIX_STATUS            0x0020  /* 1=MDI-X, 0=MDI */
+#define IFE_PMC_FORCE_MDIX             0x0040  /* 1=force MDI-X, 0=force MDI */
+#define IFE_PMC_AUTO_MDIX              0x0080  /* 1=enable auto, 0=disable */
+
+/* SFP modules ID memory locations */
+#define E1000_SFF_IDENTIFIER_OFFSET    0x00
+#define E1000_SFF_IDENTIFIER_SFF       0x02
+#define E1000_SFF_IDENTIFIER_SFP       0x03
+
+#define E1000_SFF_ETH_FLAGS_OFFSET     0x06
+/* Flags for SFP modules compatible with ETH up to 1Gb */
+struct sfp_e1000_flags {
+       u8 e1000_base_sx:1;
+       u8 e1000_base_lx:1;
+       u8 e1000_base_cx:1;
+       u8 e1000_base_t:1;
+       u8 e100_base_lx:1;
+       u8 e100_base_fx:1;
+       u8 e10_base_bx10:1;
+       u8 e10_base_px:1;
+};
+
+/* Vendor OUIs: format of OUI is 0x[byte0][byte1][byte2][00] */
+#define E1000_SFF_VENDOR_OUI_TYCO      0x00407600
+#define E1000_SFF_VENDOR_OUI_FTL       0x00906500
+#define E1000_SFF_VENDOR_OUI_AVAGO     0x00176A00
+#define E1000_SFF_VENDOR_OUI_INTEL     0x001B2100
+
+#endif
diff --git a/drivers/net/e1000e/regs.h b/drivers/net/e1000e/regs.h
new file mode 100644 (file)
index 0000000..8c334b6
--- /dev/null
@@ -0,0 +1,358 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 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_REGS_H_
+#define _E1000_REGS_H_
+
+#define E1000_CTRL     0x00000 /* Device Control - RW */
+#define E1000_CTRL_DUP 0x00004 /* Device Control Duplicate (Shadow) - RW */
+#define E1000_STATUS   0x00008 /* Device Status - RO */
+#define E1000_EECD     0x00010 /* EEPROM/Flash Control - RW */
+#define E1000_EERD     0x00014 /* EEPROM Read - RW */
+#define E1000_CTRL_EXT 0x00018 /* Extended Device Control - RW */
+#define E1000_FLA      0x0001C /* Flash Access - RW */
+#define E1000_MDIC     0x00020 /* MDI Control - RW */
+#define E1000_SCTL     0x00024 /* SerDes Control - RW */
+#define E1000_FCAL     0x00028 /* Flow Control Address Low - RW */
+#define E1000_FCAH     0x0002C /* Flow Control Address High -RW */
+#define E1000_FEXT     0x0002C /* Future Extended - RW */
+#define E1000_FEXTNVM4 0x00024 /* Future Extended NVM 4 - RW */
+#define E1000_FEXTNVM  0x00028 /* Future Extended NVM - RW */
+#define E1000_FCT      0x00030 /* Flow Control Type - RW */
+#define E1000_CONNSW   0x00034 /* Copper/Fiber switch control - RW */
+#define E1000_VET      0x00038 /* VLAN Ether Type - RW */
+#define E1000_ICR      0x000C0 /* Interrupt Cause Read - R/clr */
+#define E1000_ITR      0x000C4 /* Interrupt Throttling Rate - RW */
+#define E1000_ICS      0x000C8 /* Interrupt Cause Set - WO */
+#define E1000_IMS      0x000D0 /* Interrupt Mask Set - RW */
+#define E1000_IMC      0x000D8 /* Interrupt Mask Clear - WO */
+#define E1000_IAM      0x000E0 /* Interrupt Acknowledge Auto Mask */
+#define E1000_IVAR     0x000E4 /* Interrupt Vector Allocation Register - RW */
+#define E1000_SVCR     0x000F0
+#define E1000_SVT      0x000F4
+#define E1000_RCTL     0x00100 /* Rx Control - RW */
+#define E1000_FCTTV    0x00170 /* Flow Control Transmit Timer Value - RW */
+#define E1000_TXCW     0x00178 /* Tx Configuration Word - RW */
+#define E1000_RXCW     0x00180 /* Rx Configuration Word - RO */
+#define E1000_PBA_ECC  0x01100 /* PBA ECC Register */
+#define E1000_TCTL     0x00400 /* Tx Control - RW */
+#define E1000_TCTL_EXT 0x00404 /* Extended Tx Control - RW */
+#define E1000_TIPG     0x00410 /* Tx Inter-packet gap -RW */
+#define E1000_TBT      0x00448 /* Tx Burst Timer - RW */
+#define E1000_AIT      0x00458 /* Adaptive Interframe Spacing Throttle - RW */
+#define E1000_LEDCTL   0x00E00 /* LED Control - RW */
+#define E1000_EXTCNF_CTRL      0x00F00 /* Extended Configuration Control */
+#define E1000_EXTCNF_SIZE      0x00F08 /* Extended Configuration Size */
+#define E1000_PHY_CTRL 0x00F10 /* PHY Control Register in CSR */
+#define E1000_POEMB    E1000_PHY_CTRL  /* PHY OEM Bits */
+#define E1000_PBA      0x01000 /* Packet Buffer Allocation - RW */
+#define E1000_PBS      0x01008 /* Packet Buffer Size */
+#define E1000_EEMNGCTL 0x01010 /* MNG EEprom Control */
+#define E1000_EEARBC   0x01024 /* EEPROM Auto Read Bus Control */
+#define E1000_FLASHT   0x01028 /* FLASH Timer Register */
+#define E1000_EEWR     0x0102C /* EEPROM Write Register - RW */
+#define E1000_FLSWCTL  0x01030 /* FLASH control register */
+#define E1000_FLSWDATA 0x01034 /* FLASH data register */
+#define E1000_FLSWCNT  0x01038 /* FLASH Access Counter */
+#define E1000_FLOP     0x0103C /* FLASH Opcode Register */
+#define E1000_I2CCMD   0x01028 /* SFPI2C Command Register - RW */
+#define E1000_I2CPARAMS        0x0102C /* SFPI2C Parameters Register - RW */
+#define E1000_WDSTP    0x01040 /* Watchdog Setup - RW */
+#define E1000_SWDSTS   0x01044 /* SW Device Status - RW */
+#define E1000_FRTIMER  0x01048 /* Free Running Timer - RW */
+#define E1000_ERT      0x02008 /* Early Rx Threshold - RW */
+#define E1000_FCRTL    0x02160 /* Flow Control Receive Threshold Low - RW */
+#define E1000_FCRTH    0x02168 /* Flow Control Receive Threshold High - RW */
+#define E1000_PSRCTL   0x02170 /* Packet Split Receive Control - RW */
+#define E1000_RDFPCQ(_n)       (0x02430 + (0x4 * (_n)))
+#define E1000_PBRTH    0x02458 /* PB Rx Arbitration Threshold - RW */
+#define E1000_FCRTV    0x02460 /* Flow Control Refresh Timer Value - RW */
+/* Split and Replication Rx Control - RW */
+#define E1000_RDPUMB   0x025CC /* DMA Rx Descriptor uC Mailbox - RW */
+#define E1000_RDPUAD   0x025D0 /* DMA Rx Descriptor uC Addr Command - RW */
+#define E1000_RDPUWD   0x025D4 /* DMA Rx Descriptor uC Data Write - RW */
+#define E1000_RDPURD   0x025D8 /* DMA Rx Descriptor uC Data Read - RW */
+#define E1000_RDPUCTL  0x025DC /* DMA Rx Descriptor uC Control - RW */
+#define E1000_RDTR     0x02820 /* Rx Delay Timer - RW */
+#define E1000_RADV     0x0282C /* Rx Interrupt Absolute Delay Timer - RW */
+/*
+ * Convenience macros
+ *
+ * Note: "_n" is the queue number of the register to be written to.
+ *
+ * Example usage:
+ * E1000_RDBAL_REG(current_rx_queue)
+ */
+#define E1000_RDBAL(_n)        ((_n) < 4 ? (0x02800 + ((_n) * 0x100)) : \
+                        (0x0C000 + ((_n) * 0x40)))
+#define E1000_RDBAH(_n)        ((_n) < 4 ? (0x02804 + ((_n) * 0x100)) : \
+                        (0x0C004 + ((_n) * 0x40)))
+#define E1000_RDLEN(_n)        ((_n) < 4 ? (0x02808 + ((_n) * 0x100)) : \
+                        (0x0C008 + ((_n) * 0x40)))
+#define E1000_SRRCTL(_n)       ((_n) < 4 ? (0x0280C + ((_n) * 0x100)) : \
+                                (0x0C00C + ((_n) * 0x40)))
+#define E1000_RDH(_n)  ((_n) < 4 ? (0x02810 + ((_n) * 0x100)) : \
+                        (0x0C010 + ((_n) * 0x40)))
+#define E1000_RXCTL(_n)        ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \
+                        (0x0C014 + ((_n) * 0x40)))
+#define E1000_DCA_RXCTRL(_n)   E1000_RXCTL(_n)
+#define E1000_RDT(_n)  ((_n) < 4 ? (0x02818 + ((_n) * 0x100)) : \
+                        (0x0C018 + ((_n) * 0x40)))
+#define E1000_RXDCTL(_n)       ((_n) < 4 ? (0x02828 + ((_n) * 0x100)) : \
+                                (0x0C028 + ((_n) * 0x40)))
+#define E1000_RQDPC(_n)        ((_n) < 4 ? (0x02830 + ((_n) * 0x100)) : \
+                        (0x0C030 + ((_n) * 0x40)))
+#define E1000_TDBAL(_n)        ((_n) < 4 ? (0x03800 + ((_n) * 0x100)) : \
+                        (0x0E000 + ((_n) * 0x40)))
+#define E1000_TDBAH(_n)        ((_n) < 4 ? (0x03804 + ((_n) * 0x100)) : \
+                        (0x0E004 + ((_n) * 0x40)))
+#define E1000_TDLEN(_n)        ((_n) < 4 ? (0x03808 + ((_n) * 0x100)) : \
+                        (0x0E008 + ((_n) * 0x40)))
+#define E1000_TDH(_n)  ((_n) < 4 ? (0x03810 + ((_n) * 0x100)) : \
+                        (0x0E010 + ((_n) * 0x40)))
+#define E1000_TXCTL(_n)        ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \
+                        (0x0E014 + ((_n) * 0x40)))
+#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n)
+#define E1000_TDT(_n)  ((_n) < 4 ? (0x03818 + ((_n) * 0x100)) : \
+                        (0x0E018 + ((_n) * 0x40)))
+#define E1000_TXDCTL(_n)       ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) : \
+                                (0x0E028 + ((_n) * 0x40)))
+#define E1000_TDWBAL(_n)       ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) : \
+                                (0x0E038 + ((_n) * 0x40)))
+#define E1000_TDWBAH(_n)       ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) : \
+                                (0x0E03C + ((_n) * 0x40)))
+#define E1000_TARC(_n)         (0x03840 + ((_n) * 0x100))
+#define E1000_RSRPD            0x02C00 /* Rx Small Packet Detect - RW */
+#define E1000_RAID             0x02C08 /* Receive Ack Interrupt Delay - RW */
+#define E1000_TXDMAC           0x03000 /* Tx DMA Control - RW */
+#define E1000_KABGTXD          0x03004 /* AFE Band Gap Transmit Ref Data */
+#define E1000_PSRTYPE(_i)      (0x05480 + ((_i) * 4))
+#define E1000_RAL(_i)          (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
+                                (0x054E0 + ((_i - 16) * 8)))
+#define E1000_RAH(_i)          (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
+                                (0x054E4 + ((_i - 16) * 8)))
+#define E1000_SHRAL(_i)                (0x05438 + ((_i) * 8))
+#define E1000_SHRAH(_i)                (0x0543C + ((_i) * 8))
+#define E1000_IP4AT_REG(_i)    (0x05840 + ((_i) * 8))
+#define E1000_IP6AT_REG(_i)    (0x05880 + ((_i) * 4))
+#define E1000_WUPM_REG(_i)     (0x05A00 + ((_i) * 4))
+#define E1000_FFMT_REG(_i)     (0x09000 + ((_i) * 8))
+#define E1000_FFVT_REG(_i)     (0x09800 + ((_i) * 8))
+#define E1000_FFLT_REG(_i)     (0x05F00 + ((_i) * 8))
+#define E1000_TDFH             0x03410 /* Tx Data FIFO Head - RW */
+#define E1000_TDFT             0x03418 /* Tx Data FIFO Tail - RW */
+#define E1000_TDFHS            0x03420 /* Tx Data FIFO Head Saved - RW */
+#define E1000_TDFTS            0x03428 /* Tx Data FIFO Tail Saved - RW */
+#define E1000_TDFPC            0x03430 /* Tx Data FIFO Packet Count - RW */
+#define E1000_TDPUMB           0x0357C /* DMA Tx Desc uC Mail Box - RW */
+#define E1000_TDPUAD           0x03580 /* DMA Tx Desc uC Addr Command - RW */
+#define E1000_TDPUWD           0x03584 /* DMA Tx Desc uC Data Write - RW */
+#define E1000_TDPURD           0x03588 /* DMA Tx Desc uC Data  Read  - RW */
+#define E1000_TDPUCTL          0x0358C /* DMA Tx Desc uC Control - RW */
+#define E1000_DTXCTL           0x03590 /* DMA Tx Control - RW */
+#define E1000_TIDV     0x03820 /* Tx Interrupt Delay Value - RW */
+#define E1000_TADV     0x0382C /* Tx Interrupt Absolute Delay Val - RW */
+#define E1000_TSPMT    0x03830 /* TCP Segmentation PAD & Min Threshold - RW */
+#define E1000_CRCERRS  0x04000 /* CRC Error Count - R/clr */
+#define E1000_ALGNERRC 0x04004 /* Alignment Error Count - R/clr */
+#define E1000_SYMERRS  0x04008 /* Symbol Error Count - R/clr */
+#define E1000_RXERRC   0x0400C /* Receive Error Count - R/clr */
+#define E1000_MPC      0x04010 /* Missed Packet Count - R/clr */
+#define E1000_SCC      0x04014 /* Single Collision Count - R/clr */
+#define E1000_ECOL     0x04018 /* Excessive Collision Count - R/clr */
+#define E1000_MCC      0x0401C /* Multiple Collision Count - R/clr */
+#define E1000_LATECOL  0x04020 /* Late Collision Count - R/clr */
+#define E1000_COLC     0x04028 /* Collision Count - R/clr */
+#define E1000_DC       0x04030 /* Defer Count - R/clr */
+#define E1000_TNCRS    0x04034 /* Tx-No CRS - R/clr */
+#define E1000_SEC      0x04038 /* Sequence Error Count - R/clr */
+#define E1000_CEXTERR  0x0403C /* Carrier Extension Error Count - R/clr */
+#define E1000_RLEC     0x04040 /* Receive Length Error Count - R/clr */
+#define E1000_XONRXC   0x04048 /* XON Rx Count - R/clr */
+#define E1000_XONTXC   0x0404C /* XON Tx Count - R/clr */
+#define E1000_XOFFRXC  0x04050 /* XOFF Rx Count - R/clr */
+#define E1000_XOFFTXC  0x04054 /* XOFF Tx Count - R/clr */
+#define E1000_FCRUC    0x04058 /* Flow Control Rx Unsupported Count- R/clr */
+#define E1000_PRC64    0x0405C /* Packets Rx (64 bytes) - R/clr */
+#define E1000_PRC127   0x04060 /* Packets Rx (65-127 bytes) - R/clr */
+#define E1000_PRC255   0x04064 /* Packets Rx (128-255 bytes) - R/clr */
+#define E1000_PRC511   0x04068 /* Packets Rx (255-511 bytes) - R/clr */
+#define E1000_PRC1023  0x0406C /* Packets Rx (512-1023 bytes) - R/clr */
+#define E1000_PRC1522  0x04070 /* Packets Rx (1024-1522 bytes) - R/clr */
+#define E1000_GPRC     0x04074 /* Good Packets Rx Count - R/clr */
+#define E1000_BPRC     0x04078 /* Broadcast Packets Rx Count - R/clr */
+#define E1000_MPRC     0x0407C /* Multicast Packets Rx Count - R/clr */
+#define E1000_GPTC     0x04080 /* Good Packets Tx Count - R/clr */
+#define E1000_GORCL    0x04088 /* Good Octets Rx Count Low - R/clr */
+#define E1000_GORCH    0x0408C /* Good Octets Rx Count High - R/clr */
+#define E1000_GOTCL    0x04090 /* Good Octets Tx Count Low - R/clr */
+#define E1000_GOTCH    0x04094 /* Good Octets Tx Count High - R/clr */
+#define E1000_RNBC     0x040A0 /* Rx No Buffers Count - R/clr */
+#define E1000_RUC      0x040A4 /* Rx Undersize Count - R/clr */
+#define E1000_RFC      0x040A8 /* Rx Fragment Count - R/clr */
+#define E1000_ROC      0x040AC /* Rx Oversize Count - R/clr */
+#define E1000_RJC      0x040B0 /* Rx Jabber Count - R/clr */
+#define E1000_MGTPRC   0x040B4 /* Management Packets Rx Count - R/clr */
+#define E1000_MGTPDC   0x040B8 /* Management Packets Dropped Count - R/clr */
+#define E1000_MGTPTC   0x040BC /* Management Packets Tx Count - R/clr */
+#define E1000_TORL     0x040C0 /* Total Octets Rx Low - R/clr */
+#define E1000_TORH     0x040C4 /* Total Octets Rx High - R/clr */
+#define E1000_TOTL     0x040C8 /* Total Octets Tx Low - R/clr */
+#define E1000_TOTH     0x040CC /* Total Octets Tx High - R/clr */
+#define E1000_TPR      0x040D0 /* Total Packets Rx - R/clr */
+#define E1000_TPT      0x040D4 /* Total Packets Tx - R/clr */
+#define E1000_PTC64    0x040D8 /* Packets Tx (64 bytes) - R/clr */
+#define E1000_PTC127   0x040DC /* Packets Tx (65-127 bytes) - R/clr */
+#define E1000_PTC255   0x040E0 /* Packets Tx (128-255 bytes) - R/clr */
+#define E1000_PTC511   0x040E4 /* Packets Tx (256-511 bytes) - R/clr */
+#define E1000_PTC1023  0x040E8 /* Packets Tx (512-1023 bytes) - R/clr */
+#define E1000_PTC1522  0x040EC /* Packets Tx (1024-1522 Bytes) - R/clr */
+#define E1000_MPTC     0x040F0 /* Multicast Packets Tx Count - R/clr */
+#define E1000_BPTC     0x040F4 /* Broadcast Packets Tx Count - R/clr */
+#define E1000_TSCTC    0x040F8 /* TCP Segmentation Context Tx - R/clr */
+#define E1000_TSCTFC   0x040FC /* TCP Segmentation Context Tx Fail - R/clr */
+#define E1000_IAC      0x04100 /* Interrupt Assertion Count */
+#define E1000_ICRXPTC  0x04104 /* Interrupt Cause Rx Pkt Timer Expire Count */
+#define E1000_ICRXATC  0x04108 /* Interrupt Cause Rx Abs Timer Expire Count */
+#define E1000_ICTXPTC  0x0410C /* Interrupt Cause Tx Pkt Timer Expire Count */
+#define E1000_ICTXATC  0x04110 /* Interrupt Cause Tx Abs Timer Expire Count */
+#define E1000_ICTXQEC  0x04118 /* Interrupt Cause Tx Queue Empty Count */
+#define E1000_ICTXQMTC 0x0411C /* Interrupt Cause Tx Queue Min Thresh Count */
+#define E1000_ICRXDMTC 0x04120 /* Interrupt Cause Rx Desc Min Thresh Count */
+#define E1000_ICRXOC   0x04124 /* Interrupt Cause Receiver Overrun Count */
+#define E1000_CRC_OFFSET       0x05F50 /* CRC Offset register */
+
+#define E1000_PCS_CFG0 0x04200 /* PCS Configuration 0 - RW */
+#define E1000_PCS_LCTL 0x04208 /* PCS Link Control - RW */
+#define E1000_PCS_LSTAT        0x0420C /* PCS Link Status - RO */
+#define E1000_CBTMPC   0x0402C /* Circuit Breaker Tx Packet Count */
+#define E1000_HTDPMC   0x0403C /* Host Transmit Discarded Packets */
+#define E1000_CBRDPC   0x04044 /* Circuit Breaker Rx Dropped Count */
+#define E1000_CBRMPC   0x040FC /* Circuit Breaker Rx Packet Count */
+#define E1000_RPTHC    0x04104 /* Rx Packets To Host */
+#define E1000_HGPTC    0x04118 /* Host Good Packets Tx Count */
+#define E1000_HTCBDPC  0x04124 /* Host Tx Circuit Breaker Dropped Count */
+#define E1000_HGORCL   0x04128 /* Host Good Octets Received Count Low */
+#define E1000_HGORCH   0x0412C /* Host Good Octets Received Count High */
+#define E1000_HGOTCL   0x04130 /* Host Good Octets Transmit Count Low */
+#define E1000_HGOTCH   0x04134 /* Host Good Octets Transmit Count High */
+#define E1000_LENERRS  0x04138 /* Length Errors Count */
+#define E1000_SCVPC    0x04228 /* SerDes/SGMII Code Violation Pkt Count */
+#define E1000_HRMPC    0x0A018 /* Header Redirection Missed Packet Count */
+#define E1000_PCS_ANADV        0x04218 /* AN advertisement - RW */
+#define E1000_PCS_LPAB 0x0421C /* Link Partner Ability - RW */
+#define E1000_PCS_NPTX 0x04220 /* AN Next Page Transmit - RW */
+#define E1000_PCS_LPABNP       0x04224 /* Link Partner Ability Next Pg - RW */
+#define E1000_1GSTAT_RCV       0x04228 /* 1GSTAT Code Violation Pkt Cnt - RW */
+#define E1000_RXCSUM   0x05000 /* Rx Checksum Control - RW */
+#define E1000_RLPML    0x05004 /* Rx Long Packet Max Length */
+#define E1000_RFCTL    0x05008 /* Receive Filter Control */
+#define E1000_MTA      0x05200 /* Multicast Table Array - RW Array */
+#define E1000_RA       0x05400 /* Receive Address - RW Array */
+#define E1000_VFTA     0x05600 /* VLAN Filter Table Array - RW Array */
+#define E1000_VT_CTL   0x0581C /* VMDq Control - RW */
+#define E1000_CIAA     0x05B88 /* Config Indirect Access Address - RW */
+#define E1000_CIAD     0x05B8C /* Config Indirect Access Data - RW */
+#define E1000_VFQA0    0x0B000 /* VLAN Filter Queue Array 0 - RW Array */
+#define E1000_VFQA1    0x0B200 /* VLAN Filter Queue Array 1 - RW Array */
+#define E1000_WUC      0x05800 /* Wakeup Control - RW */
+#define E1000_WUFC     0x05808 /* Wakeup Filter Control - RW */
+#define E1000_WUS      0x05810 /* Wakeup Status - RO */
+#define E1000_MANC     0x05820 /* Management Control - RW */
+#define E1000_IPAV     0x05838 /* IP Address Valid - RW */
+#define E1000_IP4AT    0x05840 /* IPv4 Address Table - RW Array */
+#define E1000_IP6AT    0x05880 /* IPv6 Address Table - RW Array */
+#define E1000_WUPL     0x05900 /* Wakeup Packet Length - RW */
+#define E1000_WUPM     0x05A00 /* Wakeup Packet Memory - RO A */
+#define E1000_PBACL    0x05B68 /* MSIx PBA Clear - Read/Write 1's to clear */
+#define E1000_FFLT     0x05F00 /* Flexible Filter Length Table - RW Array */
+#define E1000_HOST_IF  0x08800 /* Host Interface */
+#define E1000_FFMT     0x09000 /* Flexible Filter Mask Table - RW Array */
+#define E1000_FFVT     0x09800 /* Flexible Filter Value Table - RW Array */
+
+#define E1000_KMRNCTRLSTA      0x00034 /* MAC-PHY interface - RW */
+#define E1000_MDPHYA           0x0003C /* PHY address - RW */
+#define E1000_MANC2H           0x05860 /* Management Control To Host - RW */
+/* Management Decision Filters */
+#define E1000_MDEF(_n)         (0x05890 + (4 * (_n)))
+#define E1000_SW_FW_SYNC       0x05B5C /* SW-FW Synchronization - RW */
+#define E1000_CCMCTL   0x05B48 /* CCM Control Register */
+#define E1000_GIOCTL   0x05B44 /* GIO Analog Control Register */
+#define E1000_SCCTL    0x05B4C /* PCIc PLL Configuration Register */
+#define E1000_GCR      0x05B00 /* PCI-Ex Control */
+#define E1000_GCR2     0x05B64 /* PCI-Ex Control #2 */
+#define E1000_GSCL_1   0x05B10 /* PCI-Ex Statistic Control #1 */
+#define E1000_GSCL_2   0x05B14 /* PCI-Ex Statistic Control #2 */
+#define E1000_GSCL_3   0x05B18 /* PCI-Ex Statistic Control #3 */
+#define E1000_GSCL_4   0x05B1C /* PCI-Ex Statistic Control #4 */
+#define E1000_FACTPS   0x05B30 /* Function Active and Power State to MNG */
+#define E1000_SWSM     0x05B50 /* SW Semaphore */
+#define E1000_FWSM     0x05B54 /* FW Semaphore */
+/* Driver-only SW semaphore (not used by BOOT agents) */
+#define E1000_SWSM2    0x05B58
+#define E1000_DCA_ID   0x05B70 /* DCA Requester ID Information - RO */
+#define E1000_DCA_CTRL 0x05B74 /* DCA Control - RW */
+#define E1000_FFLT_DBG 0x05F04 /* Debug Register */
+#define E1000_HICR     0x08F00 /* Host Interface Control */
+
+/* RSS registers */
+#define E1000_CPUVEC   0x02C10 /* CPU Vector Register - RW */
+#define E1000_MRQC     0x05818 /* Multiple Receive Control - RW */
+#define E1000_IMIR(_i) (0x05A80 + ((_i) * 4))  /* Immediate Interrupt */
+#define E1000_IMIREXT(_i)      (0x05AA0 + ((_i) * 4))  /* Immediate INTR Ext */
+#define E1000_IMIRVP           0x05AC0 /* Immediate INT Rx VLAN Priority -RW */
+#define E1000_MSIXBM(_i)       (0x01600 + ((_i) * 4))  /* MSI-X Alloc Reg -RW */
+/* MSI-X Table entry addr low reg - RW */
+#define E1000_MSIXTADD(_i)     (0x0C000 + ((_i) * 0x10))
+/* MSI-X Table entry addr upper reg - RW */
+#define E1000_MSIXTUADD(_i)    (0x0C004 + ((_i) * 0x10))
+/* MSI-X Table entry message reg - RW */
+#define E1000_MSIXTMSG(_i)     (0x0C008 + ((_i) * 0x10))
+/* MSI-X Table entry vector ctrl reg - RW */
+#define E1000_MSIXVCTRL(_i)    (0x0C00C + ((_i) * 0x10))
+#define E1000_MSIXPBA  0x0E000 /* MSI-X Pending bit array */
+#define E1000_RETA(_i) (0x05C00 + ((_i) * 4))  /* Redirection Table - RW */
+#define E1000_RSSRK(_i)        (0x05C80 + ((_i) * 4))  /* RSS Random Key - RW */
+#define E1000_RSSIM    0x05864 /* RSS Interrupt Mask */
+#define E1000_RSSIR    0x05868 /* RSS Interrupt Request */
+#define E1000_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_RXMTRL   0x0B634 /* Time sync Rx EtherType and Msg Type - RW */
+#define E1000_RXUDP    0x0B638 /* Time Sync Rx UDP Port - RW */
+
+#endif