Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
[safe/jmp/linux-2.6] / drivers / net / ixgbe / ixgbe_82599.c
index 9a99989..1984cab 100644 (file)
@@ -68,15 +68,13 @@ s32 ixgbe_clear_vmdq_82599(struct ixgbe_hw *hw, u32 rar, u32 vmdq);
 s32 ixgbe_set_vfta_82599(struct ixgbe_hw *hw, u32 vlan,
                          u32 vind, bool vlan_on);
 s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw);
-s32 ixgbe_blink_led_stop_82599(struct ixgbe_hw *hw, u32 index);
-s32 ixgbe_blink_led_start_82599(struct ixgbe_hw *hw, u32 index);
 s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw);
 s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val);
 s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val);
-s32 ixgbe_start_hw_rev_0_82599(struct ixgbe_hw *hw);
 s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw);
 s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw);
 u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw);
+static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw);
 
 void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw)
 {
@@ -102,22 +100,36 @@ s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
 
        if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
                ixgbe_init_mac_link_ops_82599(hw);
+
+               hw->phy.ops.reset = NULL;
+
                ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
                                                              &data_offset);
 
                if (ret_val != 0)
                        goto setup_sfp_out;
 
+               /* PHY config will finish before releasing the semaphore */
+               ret_val = ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
+               if (ret_val != 0) {
+                       ret_val = IXGBE_ERR_SWFW_SYNC;
+                       goto setup_sfp_out;
+               }
+
                hw->eeprom.ops.read(hw, ++data_offset, &data_value);
                while (data_value != 0xffff) {
                        IXGBE_WRITE_REG(hw, IXGBE_CORECTL, data_value);
                        IXGBE_WRITE_FLUSH(hw);
                        hw->eeprom.ops.read(hw, ++data_offset, &data_value);
                }
-               /* Now restart DSP */
-               IXGBE_WRITE_REG(hw, IXGBE_CORECTL, 0x00000102);
-               IXGBE_WRITE_REG(hw, IXGBE_CORECTL, 0x00000b1d);
-               IXGBE_WRITE_FLUSH(hw);
+               /* Now restart DSP by setting Restart_AN */
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC,
+                   (IXGBE_READ_REG(hw, IXGBE_AUTOC) | IXGBE_AUTOC_AN_RESTART));
+
+               /* Release the semaphore */
+               ixgbe_release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
+               /* Delay obtaining semaphore again to allow FW access */
+               msleep(hw->eeprom.semaphore_delay);
        }
 
 setup_sfp_out:
@@ -218,8 +230,19 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
                                       bool *negotiation)
 {
        s32 status = 0;
+       u32 autoc = 0;
 
-       switch (hw->mac.orig_autoc & IXGBE_AUTOC_LMS_MASK) {
+       /*
+        * Determine link capabilities based on the stored value of AUTOC,
+        * which represents EEPROM defaults.  If AUTOC value has not been
+        * stored, use the current register value.
+        */
+       if (hw->mac.orig_link_settings_stored)
+               autoc = hw->mac.orig_autoc;
+       else
+               autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
        case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
                *speed = IXGBE_LINK_SPEED_1GB_FULL;
                *negotiation = false;
@@ -243,22 +266,22 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
        case IXGBE_AUTOC_LMS_KX4_KX_KR:
        case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
                *speed = IXGBE_LINK_SPEED_UNKNOWN;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KR_SUPP)
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
                        *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KX4_SUPP)
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
                        *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KX_SUPP)
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
                        *speed |= IXGBE_LINK_SPEED_1GB_FULL;
                *negotiation = true;
                break;
 
        case IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII:
                *speed = IXGBE_LINK_SPEED_100_FULL;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KR_SUPP)
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
                        *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KX4_SUPP)
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
                        *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (hw->mac.orig_autoc & IXGBE_AUTOC_KX_SUPP)
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
                        *speed |= IXGBE_LINK_SPEED_1GB_FULL;
                *negotiation = true;
                break;
@@ -302,14 +325,13 @@ static s32 ixgbe_get_copper_link_capabilities_82599(struct ixgbe_hw *hw,
        *speed = 0;
        *autoneg = true;
 
-       status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_PHY_SPEED_ABILITY,
-                                     IXGBE_MDIO_PMA_PMD_DEV_TYPE,
+       status = hw->phy.ops.read_reg(hw, MDIO_SPEED, MDIO_MMD_PMAPMD,
                                      &speed_ability);
 
        if (status == 0) {
-               if (speed_ability & IXGBE_MDIO_PHY_SPEED_10G)
+               if (speed_ability & MDIO_SPEED_10G)
                    *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (speed_ability & IXGBE_MDIO_PHY_SPEED_1G)
+               if (speed_ability & MDIO_PMA_SPEED_1000)
                    *speed |= IXGBE_LINK_SPEED_1GB_FULL;
        }
 
@@ -334,8 +356,8 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
        }
 
        switch (hw->device_id) {
-       case IXGBE_DEV_ID_82599:
        case IXGBE_DEV_ID_82599_KX4:
+       case IXGBE_DEV_ID_82599_XAUI_LOM:
                /* Default device ID is mezzanine card KX/KX4 */
                media_type = ixgbe_media_type_backplane;
                break;
@@ -391,9 +413,6 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw)
                }
        }
 
-       /* Set up flow control */
-       status = ixgbe_setup_fc_generic(hw, 0);
-
        /* Add delay to filter out noises during initial link setup */
        msleep(50);
 
@@ -439,11 +458,31 @@ s32 ixgbe_setup_mac_link_speed_multispeed_fiber(struct ixgbe_hw *hw,
        u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
        bool link_up = false;
        bool negotiation;
+       int i;
 
        /* Mask off requested but non-supported speeds */
        hw->mac.ops.get_link_capabilities(hw, &phy_link_speed, &negotiation);
        speed &= phy_link_speed;
 
+        /* Set autoneg_advertised value based on input link speed */
+       hw->phy.autoneg_advertised = 0;
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
+
+       /*
+        * When the driver changes the link speeds that it can support,
+        * it sets autotry_restart to true to indicate that we need to
+        * initiate a new autotry session with the link partner.  To do
+        * so, we set the speed then disable and re-enable the tx laser, to
+        * alert the link partner that it also needs to restart autotry on its
+        * end.  This is consistent with true clause 37 autoneg, which also
+        * involves a loss of signal.
+        */
+
        /*
         * Try each speed one by one, highest priority first.  We do this in
         * software because 10gb fiber doesn't support speed autonegotiation.
@@ -452,21 +491,52 @@ s32 ixgbe_setup_mac_link_speed_multispeed_fiber(struct ixgbe_hw *hw,
                speedcnt++;
                highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;
 
-               /* Set hardware SDP's */
+               /* If we already have link at this speed, just jump out */
+               hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
+
+               if ((phy_link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)
+                       goto out;
+
+               /* Set the module link speed */
                esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);
                IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
 
-               ixgbe_setup_mac_link_speed_82599(hw,
-                                                IXGBE_LINK_SPEED_10GB_FULL,
-                                                autoneg,
-                                                autoneg_wait_to_complete);
-
-               msleep(50);
+               /* Allow module to change analog characteristics (1G->10G) */
+               msleep(40);
 
-               /* If we have link, just jump out */
-               hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
-               if (link_up)
+               status = ixgbe_setup_mac_link_speed_82599(hw,
+                                                    IXGBE_LINK_SPEED_10GB_FULL,
+                                                    autoneg,
+                                                    autoneg_wait_to_complete);
+               if (status != 0)
                        goto out;
+
+               /* Flap the tx laser if it has not already been done */
+               if (hw->mac.autotry_restart) {
+                       /* Disable tx laser; allow 100us to go dark per spec */
+                       esdp_reg |= IXGBE_ESDP_SDP3;
+                       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+                       udelay(100);
+
+                       /* Enable tx laser; allow 2ms to light up per spec */
+                       esdp_reg &= ~IXGBE_ESDP_SDP3;
+                       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+                       msleep(2);
+
+                       hw->mac.autotry_restart = false;
+               }
+
+               /* The controller may take up to 500ms at 10g to acquire link */
+               for (i = 0; i < 5; i++) {
+                       /* Wait for the link partner to also set speed */
+                       msleep(100);
+
+                       /* If we have link, just jump out */
+                       hw->mac.ops.check_link(hw, &phy_link_speed,
+                                              &link_up, false);
+                       if (link_up)
+                               goto out;
+               }
        }
 
        if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
@@ -474,16 +544,44 @@ s32 ixgbe_setup_mac_link_speed_multispeed_fiber(struct ixgbe_hw *hw,
                if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)
                        highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;
 
-               /* Set hardware SDP's */
+               /* If we already have link at this speed, just jump out */
+               hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
+
+               if ((phy_link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)
+                       goto out;
+
+               /* Set the module link speed */
                esdp_reg &= ~IXGBE_ESDP_SDP5;
                esdp_reg |= IXGBE_ESDP_SDP5_DIR;
                IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
 
-               ixgbe_setup_mac_link_speed_82599(
-                       hw, IXGBE_LINK_SPEED_1GB_FULL, autoneg,
-                       autoneg_wait_to_complete);
+               /* Allow module to change analog characteristics (10G->1G) */
+               msleep(40);
 
-               msleep(50);
+               status = ixgbe_setup_mac_link_speed_82599(hw,
+                                                     IXGBE_LINK_SPEED_1GB_FULL,
+                                                     autoneg,
+                                                     autoneg_wait_to_complete);
+               if (status != 0)
+                       goto out;
+
+               /* Flap the tx laser if it has not already been done */
+               if (hw->mac.autotry_restart) {
+                       /* Disable tx laser; allow 100us to go dark per spec */
+                       esdp_reg |= IXGBE_ESDP_SDP3;
+                       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+                       udelay(100);
+
+                       /* Enable tx laser; allow 2ms to light up per spec */
+                       esdp_reg &= ~IXGBE_ESDP_SDP3;
+                       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+                       msleep(2);
+
+                       hw->mac.autotry_restart = false;
+               }
+
+               /* Wait for the link partner to also set speed */
+               msleep(100);
 
                /* If we have link, just jump out */
                hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
@@ -549,6 +647,11 @@ s32 ixgbe_check_mac_link_82599(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
        else
                *speed = IXGBE_LINK_SPEED_100_FULL;
 
+       /* if link is down, zero out the current_mode */
+       if (*link_up == false) {
+               hw->fc.current_mode = ixgbe_fc_none;
+               hw->fc.fc_was_autonegged = false;
+       }
 
        return 0;
 }
@@ -569,6 +672,8 @@ s32 ixgbe_setup_mac_link_speed_82599(struct ixgbe_hw *hw,
        s32 status = 0;
        u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
        u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       u32 start_autoc = autoc;
+       u32 orig_autoc = 0;
        u32 link_mode = autoc & IXGBE_AUTOC_LMS_MASK;
        u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
        u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
@@ -582,15 +687,25 @@ s32 ixgbe_setup_mac_link_speed_82599(struct ixgbe_hw *hw,
 
        if (speed == IXGBE_LINK_SPEED_UNKNOWN) {
                status = IXGBE_ERR_LINK_SETUP;
-       } else if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
-                  link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
-                  link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
+               goto out;
+       }
+
+       /* Use stored value (EEPROM defaults) of AUTOC to find KR/KX4 support*/
+       if (hw->mac.orig_link_settings_stored)
+               orig_autoc = hw->mac.orig_autoc;
+       else
+               orig_autoc = autoc;
+
+
+       if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
+           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
+           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
                /* Set KX4/KX/KR support according to speed requested */
                autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
                if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-                       if (hw->mac.orig_autoc & IXGBE_AUTOC_KX4_SUPP)
+                       if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
                                autoc |= IXGBE_AUTOC_KX4_SUPP;
-                       if (hw->mac.orig_autoc & IXGBE_AUTOC_KR_SUPP)
+                       if (orig_autoc & IXGBE_AUTOC_KR_SUPP)
                                autoc |= IXGBE_AUTOC_KR_SUPP;
                if (speed & IXGBE_LINK_SPEED_1GB_FULL)
                        autoc |= IXGBE_AUTOC_KX_SUPP;
@@ -616,7 +731,7 @@ s32 ixgbe_setup_mac_link_speed_82599(struct ixgbe_hw *hw,
                }
        }
 
-       if (status == 0) {
+       if (autoc != start_autoc) {
                /* Restart link */
                autoc |= IXGBE_AUTOC_AN_RESTART;
                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
@@ -643,13 +758,11 @@ s32 ixgbe_setup_mac_link_speed_82599(struct ixgbe_hw *hw,
                        }
                }
 
-               /* Set up flow control */
-               status = ixgbe_setup_fc_generic(hw, 0);
-
                /* Add delay to filter out noises during initial link setup */
                msleep(50);
        }
 
+out:
        return status;
 }
 
@@ -716,19 +829,24 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
        /* Call adapter stop to disable tx/rx and clear interrupts */
        hw->mac.ops.stop_adapter(hw);
 
-       /* Reset PHY */
-       if (hw->phy.reset_disable == false) {
-               /* PHY ops must be identified and initialized prior to reset */
+       /* PHY ops must be identified and initialized prior to reset */
 
-               /* Init PHY and function pointers, perform SFP setup */
-               status = hw->phy.ops.init(hw);
+       /* Init PHY and function pointers, perform SFP setup */
+       status = hw->phy.ops.init(hw);
 
-               if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
-                       goto reset_hw_out;
+       if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+               goto reset_hw_out;
 
-               hw->phy.ops.reset(hw);
+       /* Setup SFP module if there is one present. */
+       if (hw->phy.sfp_setup_needed) {
+               status = hw->mac.ops.setup_sfp(hw);
+               hw->phy.sfp_setup_needed = false;
        }
 
+       /* Reset PHY */
+       if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
+               hw->phy.ops.reset(hw);
+
        /*
         * Prevent the PCI-E bus from from hanging by disabling PCI-E master
         * access and verify no pending requests before reset
@@ -792,9 +910,29 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
                }
        }
 
+       /*
+        * Store MAC address from RAR0, clear receive address registers, and
+        * clear the multicast table.  Also reset num_rar_entries to 128,
+        * since we modify this value when programming the SAN MAC address.
+        */
+       hw->mac.num_rar_entries = 128;
+       hw->mac.ops.init_rx_addrs(hw);
+
        /* Store the permanent mac address */
        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
 
+       /* Store the permanent SAN mac address */
+       hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
+
+       /* Add the SAN MAC address to the RAR only if it's a valid address */
+       if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {
+               hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
+                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
+
+               /* Reserve the last RAR for the SAN MAC address */
+               hw->mac.num_rar_entries--;
+       }
+
 reset_hw_out:
        return status;
 }
@@ -1012,55 +1150,946 @@ s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw)
 }
 
 /**
- *  ixgbe_blink_led_start_82599 - Blink LED based on index.
+ *  ixgbe_init_uta_tables_82599 - Initialize the Unicast Table Array
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw)
+{
+       int i;
+       hw_dbg(hw, " Clearing UTA\n");
+
+       for (i = 0; i < 128; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), 0);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_reinit_fdir_tables_82599 - Reinitialize Flow Director tables.
  *  @hw: pointer to hardware structure
- *  @index: led number to blink
  **/
-s32 ixgbe_blink_led_start_82599(struct ixgbe_hw *hw, u32 index)
+s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw)
 {
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+       int i;
+       u32 fdirctrl = IXGBE_READ_REG(hw, IXGBE_FDIRCTRL);
+       fdirctrl &= ~IXGBE_FDIRCTRL_INIT_DONE;
+
+       /*
+        * Before starting reinitialization process,
+        * FDIRCMD.CMD must be zero.
+        */
+       for (i = 0; i < IXGBE_FDIRCMD_CMD_POLL; i++) {
+               if (!(IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
+                     IXGBE_FDIRCMD_CMD_MASK))
+                       break;
+               udelay(10);
+       }
+       if (i >= IXGBE_FDIRCMD_CMD_POLL) {
+               hw_dbg(hw ,"Flow Director previous command isn't complete, "
+                      "aborting table re-initialization. \n");
+               return IXGBE_ERR_FDIR_REINIT_FAILED;
+       }
 
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg |= IXGBE_LED_BLINK(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRFREE, 0);
+       IXGBE_WRITE_FLUSH(hw);
+       /*
+        * 82599 adapters flow director init flow cannot be restarted,
+        * Workaround 82599 silicon errata by performing the following steps
+        * before re-writing the FDIRCTRL control register with the same value.
+        * - write 1 to bit 8 of FDIRCMD register &
+        * - write 0 to bit 8 of FDIRCMD register
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
+                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) |
+                        IXGBE_FDIRCMD_CLEARHT));
+       IXGBE_WRITE_FLUSH(hw);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
+                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
+                        ~IXGBE_FDIRCMD_CLEARHT));
        IXGBE_WRITE_FLUSH(hw);
+       /*
+        * Clear FDIR Hash register to clear any leftover hashes
+        * waiting to be programmed.
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, 0x00);
+       IXGBE_WRITE_FLUSH(hw);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Poll init-done after we write FDIRCTRL register */
+       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
+               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
+                                  IXGBE_FDIRCTRL_INIT_DONE)
+                       break;
+               udelay(10);
+       }
+       if (i >= IXGBE_FDIR_INIT_DONE_POLL) {
+               hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");
+               return IXGBE_ERR_FDIR_REINIT_FAILED;
+       }
+
+       /* Clear FDIR statistics registers (read to clear) */
+       IXGBE_READ_REG(hw, IXGBE_FDIRUSTAT);
+       IXGBE_READ_REG(hw, IXGBE_FDIRFSTAT);
+       IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
+       IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
+       IXGBE_READ_REG(hw, IXGBE_FDIRLEN);
 
        return 0;
 }
 
 /**
- *  ixgbe_blink_led_stop_82599 - Stop blinking LED based on index.
+ *  ixgbe_init_fdir_signature_82599 - Initialize Flow Director signature filters
  *  @hw: pointer to hardware structure
- *  @index: led number to stop blinking
+ *  @pballoc: which mode to allocate filters with
  **/
-s32 ixgbe_blink_led_stop_82599(struct ixgbe_hw *hw, u32 index)
+s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc)
 {
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+       u32 fdirctrl = 0;
+       u32 pbsize;
+       int i;
+
+       /*
+        * Before enabling Flow Director, the Rx Packet Buffer size
+        * must be reduced.  The new value is the current size minus
+        * flow director memory usage size.
+        */
+       pbsize = (1 << (IXGBE_FDIR_PBALLOC_SIZE_SHIFT + pballoc));
+       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0),
+           (IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(0)) - pbsize));
+
+       /*
+        * The defaults in the HW for RX PB 1-7 are not zero and so should be
+        * intialized to zero for non DCB mode otherwise actual total RX PB
+        * would be bigger than programmed and filter space would run into
+        * the PB 0 region.
+        */
+       for (i = 1; i < 8; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
+
+       /* Send interrupt when 64 filters are left */
+       fdirctrl |= 4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT;
+
+       /* Set the maximum length per hash bucket to 0xA filters */
+       fdirctrl |= 0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT;
+
+       switch (pballoc) {
+       case IXGBE_FDIR_PBALLOC_64K:
+               /* 8k - 1 signature filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_64K;
+               break;
+       case IXGBE_FDIR_PBALLOC_128K:
+               /* 16k - 1 signature filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_128K;
+               break;
+       case IXGBE_FDIR_PBALLOC_256K:
+               /* 32k - 1 signature filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_256K;
+               break;
+       default:
+               /* bad value */
+               return IXGBE_ERR_CONFIG;
+       };
 
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg &= ~IXGBE_LED_BLINK(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       /* Move the flexible bytes to use the ethertype - shift 6 words */
+       fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT);
+
+       fdirctrl |= IXGBE_FDIRCTRL_REPORT_STATUS;
+
+       /* Prime the keys for hashing */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHKEY,
+                       htonl(IXGBE_ATR_BUCKET_HASH_KEY));
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRSKEY,
+                       htonl(IXGBE_ATR_SIGNATURE_HASH_KEY));
+
+       /*
+        * Poll init-done after we write the register.  Estimated times:
+        *      10G: PBALLOC = 11b, timing is 60us
+        *       1G: PBALLOC = 11b, timing is 600us
+        *     100M: PBALLOC = 11b, timing is 6ms
+        *
+        *     Multiple these timings by 4 if under full Rx load
+        *
+        * So we'll poll for IXGBE_FDIR_INIT_DONE_POLL times, sleeping for
+        * 1 msec per poll time.  If we're at line rate and drop to 100M, then
+        * this might not finish in our poll time, but we can live with that
+        * for now.
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
        IXGBE_WRITE_FLUSH(hw);
+       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
+               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
+                                  IXGBE_FDIRCTRL_INIT_DONE)
+                       break;
+               msleep(1);
+       }
+       if (i >= IXGBE_FDIR_INIT_DONE_POLL)
+               hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");
 
        return 0;
 }
 
 /**
- *  ixgbe_init_uta_tables_82599 - Initialize the Unicast Table Array
+ *  ixgbe_init_fdir_perfect_82599 - Initialize Flow Director perfect filters
  *  @hw: pointer to hardware structure
+ *  @pballoc: which mode to allocate filters with
  **/
-s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw)
+s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc)
 {
+       u32 fdirctrl = 0;
+       u32 pbsize;
        int i;
-       hw_dbg(hw, " Clearing UTA\n");
 
-       for (i = 0; i < 128; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), 0);
+       /*
+        * Before enabling Flow Director, the Rx Packet Buffer size
+        * must be reduced.  The new value is the current size minus
+        * flow director memory usage size.
+        */
+       pbsize = (1 << (IXGBE_FDIR_PBALLOC_SIZE_SHIFT + pballoc));
+       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0),
+           (IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(0)) - pbsize));
+
+       /*
+        * The defaults in the HW for RX PB 1-7 are not zero and so should be
+        * intialized to zero for non DCB mode otherwise actual total RX PB
+        * would be bigger than programmed and filter space would run into
+        * the PB 0 region.
+        */
+       for (i = 1; i < 8; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
+
+       /* Send interrupt when 64 filters are left */
+       fdirctrl |= 4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT;
+
+       switch (pballoc) {
+       case IXGBE_FDIR_PBALLOC_64K:
+               /* 2k - 1 perfect filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_64K;
+               break;
+       case IXGBE_FDIR_PBALLOC_128K:
+               /* 4k - 1 perfect filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_128K;
+               break;
+       case IXGBE_FDIR_PBALLOC_256K:
+               /* 8k - 1 perfect filters */
+               fdirctrl |= IXGBE_FDIRCTRL_PBALLOC_256K;
+               break;
+       default:
+               /* bad value */
+               return IXGBE_ERR_CONFIG;
+       };
+
+       /* Turn perfect match filtering on */
+       fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH;
+       fdirctrl |= IXGBE_FDIRCTRL_REPORT_STATUS;
+
+       /* Move the flexible bytes to use the ethertype - shift 6 words */
+       fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT);
+
+       /* Prime the keys for hashing */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHKEY,
+                       htonl(IXGBE_ATR_BUCKET_HASH_KEY));
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRSKEY,
+                       htonl(IXGBE_ATR_SIGNATURE_HASH_KEY));
+
+       /*
+        * Poll init-done after we write the register.  Estimated times:
+        *      10G: PBALLOC = 11b, timing is 60us
+        *       1G: PBALLOC = 11b, timing is 600us
+        *     100M: PBALLOC = 11b, timing is 6ms
+        *
+        *     Multiple these timings by 4 if under full Rx load
+        *
+        * So we'll poll for IXGBE_FDIR_INIT_DONE_POLL times, sleeping for
+        * 1 msec per poll time.  If we're at line rate and drop to 100M, then
+        * this might not finish in our poll time, but we can live with that
+        * for now.
+        */
+
+       /* Set the maximum length per hash bucket to 0xA filters */
+       fdirctrl |= (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
+       IXGBE_WRITE_FLUSH(hw);
+       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
+               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
+                                  IXGBE_FDIRCTRL_INIT_DONE)
+                       break;
+               msleep(1);
+       }
+       if (i >= IXGBE_FDIR_INIT_DONE_POLL)
+               hw_dbg(hw, "Flow Director Perfect poll time exceeded!\n");
+
+       return 0;
+}
+
+
+/**
+ *  ixgbe_atr_compute_hash_82599 - Compute the hashes for SW ATR
+ *  @stream: input bitstream to compute the hash on
+ *  @key: 32-bit hash key
+ **/
+u16 ixgbe_atr_compute_hash_82599(struct ixgbe_atr_input *atr_input, u32 key)
+{
+       /*
+        * The algorithm is as follows:
+        *    Hash[15:0] = Sum { S[n] x K[n+16] }, n = 0...350
+        *    where Sum {A[n]}, n = 0...n is bitwise XOR of A[0], A[1]...A[n]
+        *    and A[n] x B[n] is bitwise AND between same length strings
+        *
+        *    K[n] is 16 bits, defined as:
+        *       for n modulo 32 >= 15, K[n] = K[n % 32 : (n % 32) - 15]
+        *       for n modulo 32 < 15, K[n] =
+        *             K[(n % 32:0) | (31:31 - (14 - (n % 32)))]
+        *
+        *    S[n] is 16 bits, defined as:
+        *       for n >= 15, S[n] = S[n:n - 15]
+        *       for n < 15, S[n] = S[(n:0) | (350:350 - (14 - n))]
+        *
+        *    To simplify for programming, the algorithm is implemented
+        *    in software this way:
+        *
+        *    Key[31:0], Stream[335:0]
+        *
+        *    tmp_key[11 * 32 - 1:0] = 11{Key[31:0] = key concatenated 11 times
+        *    int_key[350:0] = tmp_key[351:1]
+        *    int_stream[365:0] = Stream[14:0] | Stream[335:0] | Stream[335:321]
+        *
+        *    hash[15:0] = 0;
+        *    for (i = 0; i < 351; i++) {
+        *        if (int_key[i])
+        *            hash ^= int_stream[(i + 15):i];
+        *    }
+        */
+
+       union {
+               u64    fill[6];
+               u32    key[11];
+               u8     key_stream[44];
+       } tmp_key;
+
+       u8   *stream = (u8 *)atr_input;
+       u8   int_key[44];      /* upper-most bit unused */
+       u8   hash_str[46];     /* upper-most 2 bits unused */
+       u16  hash_result = 0;
+       int  i, j, k, h;
+
+       /*
+        * Initialize the fill member to prevent warnings
+        * on some compilers
+        */
+        tmp_key.fill[0] = 0;
+
+       /* First load the temporary key stream */
+       for (i = 0; i < 6; i++) {
+               u64 fillkey = ((u64)key << 32) | key;
+               tmp_key.fill[i] = fillkey;
+       }
+
+       /*
+        * Set the interim key for the hashing.  Bit 352 is unused, so we must
+        * shift and compensate when building the key.
+        */
+
+       int_key[0] = tmp_key.key_stream[0] >> 1;
+       for (i = 1, j = 0; i < 44; i++) {
+               unsigned int this_key = tmp_key.key_stream[j] << 7;
+               j++;
+               int_key[i] = (u8)(this_key | (tmp_key.key_stream[j] >> 1));
+       }
+
+       /*
+        * Set the interim bit string for the hashing.  Bits 368 and 367 are
+        * unused, so shift and compensate when building the string.
+        */
+       hash_str[0] = (stream[40] & 0x7f) >> 1;
+       for (i = 1, j = 40; i < 46; i++) {
+               unsigned int this_str = stream[j] << 7;
+               j++;
+               if (j > 41)
+                       j = 0;
+               hash_str[i] = (u8)(this_str | (stream[j] >> 1));
+       }
+
+       /*
+        * Now compute the hash.  i is the index into hash_str, j is into our
+        * key stream, k is counting the number of bits, and h interates within
+        * each byte.
+        */
+       for (i = 45, j = 43, k = 0; k < 351 && i >= 2 && j >= 0; i--, j--) {
+               for (h = 0; h < 8 && k < 351; h++, k++) {
+                       if (int_key[j] & (1 << h)) {
+                               /*
+                                * Key bit is set, XOR in the current 16-bit
+                                * string.  Example of processing:
+                                *    h = 0,
+                                *      tmp = (hash_str[i - 2] & 0 << 16) |
+                                *            (hash_str[i - 1] & 0xff << 8) |
+                                *            (hash_str[i] & 0xff >> 0)
+                                *      So tmp = hash_str[15 + k:k], since the
+                                *      i + 2 clause rolls off the 16-bit value
+                                *    h = 7,
+                                *      tmp = (hash_str[i - 2] & 0x7f << 9) |
+                                *            (hash_str[i - 1] & 0xff << 1) |
+                                *            (hash_str[i] & 0x80 >> 7)
+                                */
+                               int tmp = (hash_str[i] >> h);
+                               tmp |= (hash_str[i - 1] << (8 - h));
+                               tmp |= (int)(hash_str[i - 2] & ((1 << h) - 1))
+                                            << (16 - h);
+                               hash_result ^= (u16)tmp;
+                       }
+               }
+       }
+
+       return hash_result;
+}
+
+/**
+ *  ixgbe_atr_set_vlan_id_82599 - Sets the VLAN id in the ATR input stream
+ *  @input: input stream to modify
+ *  @vlan: the VLAN id to load
+ **/
+s32 ixgbe_atr_set_vlan_id_82599(struct ixgbe_atr_input *input, u16 vlan)
+{
+       input->byte_stream[IXGBE_ATR_VLAN_OFFSET + 1] = vlan >> 8;
+       input->byte_stream[IXGBE_ATR_VLAN_OFFSET] = vlan & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_src_ipv4_82599 - Sets the source IPv4 address
+ *  @input: input stream to modify
+ *  @src_addr: the IP address to load
+ **/
+s32 ixgbe_atr_set_src_ipv4_82599(struct ixgbe_atr_input *input, u32 src_addr)
+{
+       input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 3] = src_addr >> 24;
+       input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 2] =
+                                                      (src_addr >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 1] =
+                                                       (src_addr >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET] = src_addr & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_dst_ipv4_82599 - Sets the destination IPv4 address
+ *  @input: input stream to modify
+ *  @dst_addr: the IP address to load
+ **/
+s32 ixgbe_atr_set_dst_ipv4_82599(struct ixgbe_atr_input *input, u32 dst_addr)
+{
+       input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 3] = dst_addr >> 24;
+       input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 2] =
+                                                      (dst_addr >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 1] =
+                                                       (dst_addr >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET] = dst_addr & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_src_ipv6_82599 - Sets the source IPv6 address
+ *  @input: input stream to modify
+ *  @src_addr_1: the first 4 bytes of the IP address to load
+ *  @src_addr_2: the second 4 bytes of the IP address to load
+ *  @src_addr_3: the third 4 bytes of the IP address to load
+ *  @src_addr_4: the fourth 4 bytes of the IP address to load
+ **/
+s32 ixgbe_atr_set_src_ipv6_82599(struct ixgbe_atr_input *input,
+                                 u32 src_addr_1, u32 src_addr_2,
+                                 u32 src_addr_3, u32 src_addr_4)
+{
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET] = src_addr_4 & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 1] =
+                                                      (src_addr_4 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 2] =
+                                                     (src_addr_4 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 3] = src_addr_4 >> 24;
+
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 4] = src_addr_3 & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 5] =
+                                                      (src_addr_3 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 6] =
+                                                     (src_addr_3 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 7] = src_addr_3 >> 24;
+
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 8] = src_addr_2 & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 9] =
+                                                      (src_addr_2 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 10] =
+                                                     (src_addr_2 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 11] = src_addr_2 >> 24;
+
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 12] = src_addr_1 & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 13] =
+                                                      (src_addr_1 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 14] =
+                                                     (src_addr_1 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 15] = src_addr_1 >> 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_dst_ipv6_82599 - Sets the destination IPv6 address
+ *  @input: input stream to modify
+ *  @dst_addr_1: the first 4 bytes of the IP address to load
+ *  @dst_addr_2: the second 4 bytes of the IP address to load
+ *  @dst_addr_3: the third 4 bytes of the IP address to load
+ *  @dst_addr_4: the fourth 4 bytes of the IP address to load
+ **/
+s32 ixgbe_atr_set_dst_ipv6_82599(struct ixgbe_atr_input *input,
+                                 u32 dst_addr_1, u32 dst_addr_2,
+                                 u32 dst_addr_3, u32 dst_addr_4)
+{
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET] = dst_addr_4 & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 1] =
+                                                      (dst_addr_4 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 2] =
+                                                     (dst_addr_4 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 3] = dst_addr_4 >> 24;
+
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 4] = dst_addr_3 & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 5] =
+                                                      (dst_addr_3 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 6] =
+                                                     (dst_addr_3 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 7] = dst_addr_3 >> 24;
+
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 8] = dst_addr_2 & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 9] =
+                                                      (dst_addr_2 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 10] =
+                                                     (dst_addr_2 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 11] = dst_addr_2 >> 24;
+
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 12] = dst_addr_1 & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 13] =
+                                                      (dst_addr_1 >> 8) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 14] =
+                                                     (dst_addr_1 >> 16) & 0xff;
+       input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 15] = dst_addr_1 >> 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_src_port_82599 - Sets the source port
+ *  @input: input stream to modify
+ *  @src_port: the source port to load
+ **/
+s32 ixgbe_atr_set_src_port_82599(struct ixgbe_atr_input *input, u16 src_port)
+{
+       input->byte_stream[IXGBE_ATR_SRC_PORT_OFFSET + 1] = src_port >> 8;
+       input->byte_stream[IXGBE_ATR_SRC_PORT_OFFSET] = src_port & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_dst_port_82599 - Sets the destination port
+ *  @input: input stream to modify
+ *  @dst_port: the destination port to load
+ **/
+s32 ixgbe_atr_set_dst_port_82599(struct ixgbe_atr_input *input, u16 dst_port)
+{
+       input->byte_stream[IXGBE_ATR_DST_PORT_OFFSET + 1] = dst_port >> 8;
+       input->byte_stream[IXGBE_ATR_DST_PORT_OFFSET] = dst_port & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_flex_byte_82599 - Sets the flexible bytes
+ *  @input: input stream to modify
+ *  @flex_bytes: the flexible bytes to load
+ **/
+s32 ixgbe_atr_set_flex_byte_82599(struct ixgbe_atr_input *input, u16 flex_byte)
+{
+       input->byte_stream[IXGBE_ATR_FLEX_BYTE_OFFSET + 1] = flex_byte >> 8;
+       input->byte_stream[IXGBE_ATR_FLEX_BYTE_OFFSET] = flex_byte & 0xff;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_vm_pool_82599 - Sets the Virtual Machine pool
+ *  @input: input stream to modify
+ *  @vm_pool: the Virtual Machine pool to load
+ **/
+s32 ixgbe_atr_set_vm_pool_82599(struct ixgbe_atr_input *input, u8 vm_pool)
+{
+       input->byte_stream[IXGBE_ATR_VM_POOL_OFFSET] = vm_pool;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_set_l4type_82599 - Sets the layer 4 packet type
+ *  @input: input stream to modify
+ *  @l4type: the layer 4 type value to load
+ **/
+s32 ixgbe_atr_set_l4type_82599(struct ixgbe_atr_input *input, u8 l4type)
+{
+       input->byte_stream[IXGBE_ATR_L4TYPE_OFFSET] = l4type;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_vlan_id_82599 - Gets the VLAN id from the ATR input stream
+ *  @input: input stream to search
+ *  @vlan: the VLAN id to load
+ **/
+s32 ixgbe_atr_get_vlan_id_82599(struct ixgbe_atr_input *input, u16 *vlan)
+{
+       *vlan = input->byte_stream[IXGBE_ATR_VLAN_OFFSET];
+       *vlan |= input->byte_stream[IXGBE_ATR_VLAN_OFFSET + 1] << 8;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_src_ipv4_82599 - Gets the source IPv4 address
+ *  @input: input stream to search
+ *  @src_addr: the IP address to load
+ **/
+s32 ixgbe_atr_get_src_ipv4_82599(struct ixgbe_atr_input *input, u32 *src_addr)
+{
+       *src_addr = input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET];
+       *src_addr |= input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 1] << 8;
+       *src_addr |= input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 2] << 16;
+       *src_addr |= input->byte_stream[IXGBE_ATR_SRC_IPV4_OFFSET + 3] << 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_dst_ipv4_82599 - Gets the destination IPv4 address
+ *  @input: input stream to search
+ *  @dst_addr: the IP address to load
+ **/
+s32 ixgbe_atr_get_dst_ipv4_82599(struct ixgbe_atr_input *input, u32 *dst_addr)
+{
+       *dst_addr = input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET];
+       *dst_addr |= input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 1] << 8;
+       *dst_addr |= input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 2] << 16;
+       *dst_addr |= input->byte_stream[IXGBE_ATR_DST_IPV4_OFFSET + 3] << 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_src_ipv6_82599 - Gets the source IPv6 address
+ *  @input: input stream to search
+ *  @src_addr_1: the first 4 bytes of the IP address to load
+ *  @src_addr_2: the second 4 bytes of the IP address to load
+ *  @src_addr_3: the third 4 bytes of the IP address to load
+ *  @src_addr_4: the fourth 4 bytes of the IP address to load
+ **/
+s32 ixgbe_atr_get_src_ipv6_82599(struct ixgbe_atr_input *input,
+                                 u32 *src_addr_1, u32 *src_addr_2,
+                                 u32 *src_addr_3, u32 *src_addr_4)
+{
+       *src_addr_1 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 12];
+       *src_addr_1 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 13] << 8;
+       *src_addr_1 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 14] << 16;
+       *src_addr_1 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 15] << 24;
+
+       *src_addr_2 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 8];
+       *src_addr_2 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 9] << 8;
+       *src_addr_2 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 10] << 16;
+       *src_addr_2 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 11] << 24;
+
+       *src_addr_3 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 4];
+       *src_addr_3 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 5] << 8;
+       *src_addr_3 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 6] << 16;
+       *src_addr_3 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 7] << 24;
+
+       *src_addr_4 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET];
+       *src_addr_4 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 1] << 8;
+       *src_addr_4 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 2] << 16;
+       *src_addr_4 = input->byte_stream[IXGBE_ATR_SRC_IPV6_OFFSET + 3] << 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_dst_ipv6_82599 - Gets the destination IPv6 address
+ *  @input: input stream to search
+ *  @dst_addr_1: the first 4 bytes of the IP address to load
+ *  @dst_addr_2: the second 4 bytes of the IP address to load
+ *  @dst_addr_3: the third 4 bytes of the IP address to load
+ *  @dst_addr_4: the fourth 4 bytes of the IP address to load
+ **/
+s32 ixgbe_atr_get_dst_ipv6_82599(struct ixgbe_atr_input *input,
+                                 u32 *dst_addr_1, u32 *dst_addr_2,
+                                 u32 *dst_addr_3, u32 *dst_addr_4)
+{
+       *dst_addr_1 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 12];
+       *dst_addr_1 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 13] << 8;
+       *dst_addr_1 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 14] << 16;
+       *dst_addr_1 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 15] << 24;
+
+       *dst_addr_2 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 8];
+       *dst_addr_2 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 9] << 8;
+       *dst_addr_2 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 10] << 16;
+       *dst_addr_2 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 11] << 24;
+
+       *dst_addr_3 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 4];
+       *dst_addr_3 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 5] << 8;
+       *dst_addr_3 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 6] << 16;
+       *dst_addr_3 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 7] << 24;
+
+       *dst_addr_4 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET];
+       *dst_addr_4 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 1] << 8;
+       *dst_addr_4 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 2] << 16;
+       *dst_addr_4 = input->byte_stream[IXGBE_ATR_DST_IPV6_OFFSET + 3] << 24;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_src_port_82599 - Gets the source port
+ *  @input: input stream to modify
+ *  @src_port: the source port to load
+ *
+ *  Even though the input is given in big-endian, the FDIRPORT registers
+ *  expect the ports to be programmed in little-endian.  Hence the need to swap
+ *  endianness when retrieving the data.  This can be confusing since the
+ *  internal hash engine expects it to be big-endian.
+ **/
+s32 ixgbe_atr_get_src_port_82599(struct ixgbe_atr_input *input, u16 *src_port)
+{
+       *src_port = input->byte_stream[IXGBE_ATR_SRC_PORT_OFFSET] << 8;
+       *src_port |= input->byte_stream[IXGBE_ATR_SRC_PORT_OFFSET + 1];
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_dst_port_82599 - Gets the destination port
+ *  @input: input stream to modify
+ *  @dst_port: the destination port to load
+ *
+ *  Even though the input is given in big-endian, the FDIRPORT registers
+ *  expect the ports to be programmed in little-endian.  Hence the need to swap
+ *  endianness when retrieving the data.  This can be confusing since the
+ *  internal hash engine expects it to be big-endian.
+ **/
+s32 ixgbe_atr_get_dst_port_82599(struct ixgbe_atr_input *input, u16 *dst_port)
+{
+       *dst_port = input->byte_stream[IXGBE_ATR_DST_PORT_OFFSET] << 8;
+       *dst_port |= input->byte_stream[IXGBE_ATR_DST_PORT_OFFSET + 1];
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_flex_byte_82599 - Gets the flexible bytes
+ *  @input: input stream to modify
+ *  @flex_bytes: the flexible bytes to load
+ **/
+s32 ixgbe_atr_get_flex_byte_82599(struct ixgbe_atr_input *input, u16 *flex_byte)
+{
+       *flex_byte = input->byte_stream[IXGBE_ATR_FLEX_BYTE_OFFSET];
+       *flex_byte |= input->byte_stream[IXGBE_ATR_FLEX_BYTE_OFFSET + 1] << 8;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_vm_pool_82599 - Gets the Virtual Machine pool
+ *  @input: input stream to modify
+ *  @vm_pool: the Virtual Machine pool to load
+ **/
+s32 ixgbe_atr_get_vm_pool_82599(struct ixgbe_atr_input *input, u8 *vm_pool)
+{
+       *vm_pool = input->byte_stream[IXGBE_ATR_VM_POOL_OFFSET];
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_get_l4type_82599 - Gets the layer 4 packet type
+ *  @input: input stream to modify
+ *  @l4type: the layer 4 type value to load
+ **/
+s32 ixgbe_atr_get_l4type_82599(struct ixgbe_atr_input *input, u8 *l4type)
+{
+       *l4type = input->byte_stream[IXGBE_ATR_L4TYPE_OFFSET];
+
+       return 0;
+}
+
+/**
+ *  ixgbe_atr_add_signature_filter_82599 - Adds a signature hash filter
+ *  @hw: pointer to hardware structure
+ *  @stream: input bitstream
+ *  @queue: queue index to direct traffic to
+ **/
+s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
+                                          struct ixgbe_atr_input *input,
+                                          u8 queue)
+{
+       u64  fdirhashcmd;
+       u64  fdircmd;
+       u32  fdirhash;
+       u16  bucket_hash, sig_hash;
+       u8   l4type;
+
+       bucket_hash = ixgbe_atr_compute_hash_82599(input,
+                                                  IXGBE_ATR_BUCKET_HASH_KEY);
+
+       /* bucket_hash is only 15 bits */
+       bucket_hash &= IXGBE_ATR_HASH_MASK;
+
+       sig_hash = ixgbe_atr_compute_hash_82599(input,
+                                               IXGBE_ATR_SIGNATURE_HASH_KEY);
+
+       /* Get the l4type in order to program FDIRCMD properly */
+       /* lowest 2 bits are FDIRCMD.L4TYPE, third lowest bit is FDIRCMD.IPV6 */
+       ixgbe_atr_get_l4type_82599(input, &l4type);
+
+       /*
+        * The lower 32-bits of fdirhashcmd is for FDIRHASH, the upper 32-bits
+        * is for FDIRCMD.  Then do a 64-bit register write from FDIRHASH.
+        */
+       fdirhash = sig_hash << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT | bucket_hash;
+
+       fdircmd = (IXGBE_FDIRCMD_CMD_ADD_FLOW | IXGBE_FDIRCMD_FILTER_UPDATE |
+                  IXGBE_FDIRCMD_LAST | IXGBE_FDIRCMD_QUEUE_EN);
+
+       switch (l4type & IXGBE_ATR_L4TYPE_MASK) {
+       case IXGBE_ATR_L4TYPE_TCP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_TCP;
+               break;
+       case IXGBE_ATR_L4TYPE_UDP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_UDP;
+               break;
+       case IXGBE_ATR_L4TYPE_SCTP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_SCTP;
+               break;
+       default:
+               hw_dbg(hw, "Error on l4type input\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       if (l4type & IXGBE_ATR_L4TYPE_IPV6_MASK)
+               fdircmd |= IXGBE_FDIRCMD_IPV6;
+
+       fdircmd |= ((u64)queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT);
+       fdirhashcmd = ((fdircmd << 32) | fdirhash);
+
+       IXGBE_WRITE_REG64(hw, IXGBE_FDIRHASH, fdirhashcmd);
 
        return 0;
 }
 
 /**
+ *  ixgbe_fdir_add_perfect_filter_82599 - Adds a perfect filter
+ *  @hw: pointer to hardware structure
+ *  @input: input bitstream
+ *  @queue: queue index to direct traffic to
+ *
+ *  Note that the caller to this function must lock before calling, since the
+ *  hardware writes must be protected from one another.
+ **/
+s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw,
+                                        struct ixgbe_atr_input *input,
+                                        u16 soft_id,
+                                        u8 queue)
+{
+       u32 fdircmd = 0;
+       u32 fdirhash;
+       u32 src_ipv4, dst_ipv4;
+       u32 src_ipv6_1, src_ipv6_2, src_ipv6_3, src_ipv6_4;
+       u16 src_port, dst_port, vlan_id, flex_bytes;
+       u16 bucket_hash;
+       u8  l4type;
+
+       /* Get our input values */
+       ixgbe_atr_get_l4type_82599(input, &l4type);
+
+       /*
+        * Check l4type formatting, and bail out before we touch the hardware
+        * if there's a configuration issue
+        */
+       switch (l4type & IXGBE_ATR_L4TYPE_MASK) {
+       case IXGBE_ATR_L4TYPE_TCP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_TCP;
+               break;
+       case IXGBE_ATR_L4TYPE_UDP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_UDP;
+               break;
+       case IXGBE_ATR_L4TYPE_SCTP:
+               fdircmd |= IXGBE_FDIRCMD_L4TYPE_SCTP;
+               break;
+       default:
+               hw_dbg(hw, "Error on l4type input\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       bucket_hash = ixgbe_atr_compute_hash_82599(input,
+                                                  IXGBE_ATR_BUCKET_HASH_KEY);
+
+       /* bucket_hash is only 15 bits */
+       bucket_hash &= IXGBE_ATR_HASH_MASK;
+
+       ixgbe_atr_get_vlan_id_82599(input, &vlan_id);
+       ixgbe_atr_get_src_port_82599(input, &src_port);
+       ixgbe_atr_get_dst_port_82599(input, &dst_port);
+       ixgbe_atr_get_flex_byte_82599(input, &flex_bytes);
+
+       fdirhash = soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT | bucket_hash;
+
+       /* Now figure out if we're IPv4 or IPv6 */
+       if (l4type & IXGBE_ATR_L4TYPE_IPV6_MASK) {
+               /* IPv6 */
+               ixgbe_atr_get_src_ipv6_82599(input, &src_ipv6_1, &src_ipv6_2,
+                                            &src_ipv6_3, &src_ipv6_4);
+
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRSIPv6(0), src_ipv6_1);
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRSIPv6(1), src_ipv6_2);
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRSIPv6(2), src_ipv6_3);
+               /* The last 4 bytes is the same register as IPv4 */
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRIPSA, src_ipv6_4);
+
+               fdircmd |= IXGBE_FDIRCMD_IPV6;
+               fdircmd |= IXGBE_FDIRCMD_IPv6DMATCH;
+       } else {
+               /* IPv4 */
+               ixgbe_atr_get_src_ipv4_82599(input, &src_ipv4);
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRIPSA, src_ipv4);
+
+       }
+
+       ixgbe_atr_get_dst_ipv4_82599(input, &dst_ipv4);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRIPDA, dst_ipv4);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, (vlan_id |
+                                   (flex_bytes << IXGBE_FDIRVLAN_FLEX_SHIFT)));
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRPORT, (src_port |
+                              (dst_port << IXGBE_FDIRPORT_DESTINATION_SHIFT)));
+
+       fdircmd |= IXGBE_FDIRCMD_CMD_ADD_FLOW;
+       fdircmd |= IXGBE_FDIRCMD_FILTER_UPDATE;
+       fdircmd |= IXGBE_FDIRCMD_LAST;
+       fdircmd |= IXGBE_FDIRCMD_QUEUE_EN;
+       fdircmd |= queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT;
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, fdircmd);
+
+       return 0;
+}
+/**
  *  ixgbe_read_analog_reg8_82599 - Reads 8 bit Omer analog register
  *  @hw: pointer to hardware structure
  *  @reg: analog register to read
@@ -1113,8 +2142,9 @@ s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val)
 s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
 {
        u32 q_num;
+       s32 ret_val;
 
-       ixgbe_start_hw_generic(hw);
+       ret_val = ixgbe_start_hw_generic(hw);
 
        /* Clear the rate limiters */
        for (q_num = 0; q_num < hw->mac.max_tx_queues; q_num++) {
@@ -1123,7 +2153,13 @@ s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
        }
        IXGBE_WRITE_FLUSH(hw);
 
-       return 0;
+       /* We need to run link autotry after the driver loads */
+       hw->mac.autotry_restart = true;
+
+       if (ret_val == 0)
+               ret_val = ixgbe_verify_fw_version_82599(hw);
+
+       return ret_val;
 }
 
 /**
@@ -1150,53 +2186,100 @@ s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
 u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
 {
        u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
+       u32 pma_pmd_10g_parallel = autoc & IXGBE_AUTOC_10G_PMA_PMD_MASK;
+       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
+       u16 ext_ability = 0;
        u8 comp_codes_10g = 0;
 
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_82599:
-       case IXGBE_DEV_ID_82599_KX4:
-               /* Default device ID is mezzanine card KX/KX4 */
-               physical_layer = (IXGBE_PHYSICAL_LAYER_10GBASE_KX4 |
-                                 IXGBE_PHYSICAL_LAYER_1000BASE_KX);
+       hw->phy.ops.identify(hw);
+
+       if (hw->phy.type == ixgbe_phy_tn ||
+           hw->phy.type == ixgbe_phy_cu_unknown) {
+               hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
+                                    &ext_ability);
+               if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
+               goto out;
+       }
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
+       case IXGBE_AUTOC_LMS_1G_AN:
+       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
+               if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {
+                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |
+                           IXGBE_PHYSICAL_LAYER_1000BASE_BX;
+                       goto out;
+               } else
+                       /* SFI mode so read SFP module */
+                       goto sfp_check;
                break;
-       case IXGBE_DEV_ID_82599_SFP:
-               hw->phy.ops.identify_sfp(hw);
+       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
+               if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_CX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
+               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
+               goto out;
+               break;
+       case IXGBE_AUTOC_LMS_10G_SERIAL:
+               if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
+                       goto out;
+               } else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)
+                       goto sfp_check;
+               break;
+       case IXGBE_AUTOC_LMS_KX4_KX_KR:
+       case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
+               goto out;
+               break;
+       default:
+               goto out;
+               break;
+       }
 
-               switch (hw->phy.sfp_type) {
-               case ixgbe_sfp_type_da_cu:
-               case ixgbe_sfp_type_da_cu_core0:
-               case ixgbe_sfp_type_da_cu_core1:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
-                       break;
-               case ixgbe_sfp_type_sr:
+sfp_check:
+       /* SFP check must be done last since DA modules are sometimes used to
+        * test KR mode -  we need to id KR mode correctly before SFP module.
+        * Call identify_sfp because the pluggable module may have changed */
+       hw->phy.ops.identify_sfp(hw);
+       if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
+               goto out;
+
+       switch (hw->phy.type) {
+       case ixgbe_phy_tw_tyco:
+       case ixgbe_phy_tw_unknown:
+               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
+               break;
+       case ixgbe_phy_sfp_avago:
+       case ixgbe_phy_sfp_ftl:
+       case ixgbe_phy_sfp_intel:
+       case ixgbe_phy_sfp_unknown:
+               hw->phy.ops.read_i2c_eeprom(hw,
+                     IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);
+               if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
                        physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
-                       break;
-               case ixgbe_sfp_type_lr:
+               else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
                        physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
-                       break;
-               case ixgbe_sfp_type_srlr_core0:
-               case ixgbe_sfp_type_srlr_core1:
-                       hw->phy.ops.read_i2c_eeprom(hw,
-                                                   IXGBE_SFF_10GBE_COMP_CODES,
-                                                   &comp_codes_10g);
-                       if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
-                               physical_layer =
-                                               IXGBE_PHYSICAL_LAYER_10GBASE_SR;
-                       else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
-                               physical_layer =
-                                               IXGBE_PHYSICAL_LAYER_10GBASE_LR;
-                       else
-                               physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-               default:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-                       break;
-               }
                break;
        default:
-               physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
                break;
        }
 
+out:
        return physical_layer;
 }
 
@@ -1244,6 +2327,138 @@ s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval)
        return 0;
 }
 
+/**
+ *  ixgbe_get_device_caps_82599 - Get additional device capabilities
+ *  @hw: pointer to hardware structure
+ *  @device_caps: the EEPROM word with the extra device capabilities
+ *
+ *  This function will read the EEPROM location for the device capabilities,
+ *  and return the word through device_caps.
+ **/
+s32 ixgbe_get_device_caps_82599(struct ixgbe_hw *hw, u16 *device_caps)
+{
+       hw->eeprom.ops.read(hw, IXGBE_DEVICE_CAPS, device_caps);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_san_mac_addr_offset_82599 - SAN MAC address offset for 82599
+ *  @hw: pointer to hardware structure
+ *  @san_mac_offset: SAN MAC address offset
+ *
+ *  This function will read the EEPROM location for the SAN MAC address
+ *  pointer, and returns the value at that location.  This is used in both
+ *  get and set mac_addr routines.
+ **/
+s32 ixgbe_get_san_mac_addr_offset_82599(struct ixgbe_hw *hw,
+                                        u16 *san_mac_offset)
+{
+       /*
+        * First read the EEPROM pointer to see if the MAC addresses are
+        * available.
+        */
+       hw->eeprom.ops.read(hw, IXGBE_SAN_MAC_ADDR_PTR, san_mac_offset);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_san_mac_addr_82599 - SAN MAC address retrieval for 82599
+ *  @hw: pointer to hardware structure
+ *  @san_mac_addr: SAN MAC address
+ *
+ *  Reads the SAN MAC address from the EEPROM, if it's available.  This is
+ *  per-port, so set_lan_id() must be called before reading the addresses.
+ *  set_lan_id() is called by identify_sfp(), but this cannot be relied
+ *  upon for non-SFP connections, so we must call it here.
+ **/
+s32 ixgbe_get_san_mac_addr_82599(struct ixgbe_hw *hw, u8 *san_mac_addr)
+{
+       u16 san_mac_data, san_mac_offset;
+       u8 i;
+
+       /*
+        * First read the EEPROM pointer to see if the MAC addresses are
+        * available.  If they're not, no point in calling set_lan_id() here.
+        */
+       ixgbe_get_san_mac_addr_offset_82599(hw, &san_mac_offset);
+
+       if ((san_mac_offset == 0) || (san_mac_offset == 0xFFFF)) {
+               /*
+                * No addresses available in this EEPROM.  It's not an
+                * error though, so just wipe the local address and return.
+                */
+               for (i = 0; i < 6; i++)
+                       san_mac_addr[i] = 0xFF;
+
+               goto san_mac_addr_out;
+       }
+
+       /* make sure we know which port we need to program */
+       hw->mac.ops.set_lan_id(hw);
+       /* apply the port offset to the address offset */
+       (hw->bus.func) ? (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT1_OFFSET) :
+                        (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT0_OFFSET);
+       for (i = 0; i < 3; i++) {
+               hw->eeprom.ops.read(hw, san_mac_offset, &san_mac_data);
+               san_mac_addr[i * 2] = (u8)(san_mac_data);
+               san_mac_addr[i * 2 + 1] = (u8)(san_mac_data >> 8);
+               san_mac_offset++;
+       }
+
+san_mac_addr_out:
+       return 0;
+}
+
+/**
+ *  ixgbe_verify_fw_version_82599 - verify fw version for 82599
+ *  @hw: pointer to hardware structure
+ *
+ *  Verifies that installed the firmware version is 0.6 or higher
+ *  for SFI devices. All 82599 SFI devices should have version 0.6 or higher.
+ *
+ *  Returns IXGBE_ERR_EEPROM_VERSION if the FW is not present or
+ *  if the FW version is not supported.
+ **/
+static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_EEPROM_VERSION;
+       u16 fw_offset, fw_ptp_cfg_offset;
+       u16 fw_version = 0;
+
+       /* firmware check is only necessary for SFI devices */
+       if (hw->phy.media_type != ixgbe_media_type_fiber) {
+               status = 0;
+               goto fw_version_out;
+       }
+
+       /* get the offset to the Firmware Module block */
+       hw->eeprom.ops.read(hw, IXGBE_FW_PTR, &fw_offset);
+
+       if ((fw_offset == 0) || (fw_offset == 0xFFFF))
+               goto fw_version_out;
+
+       /* get the offset to the Pass Through Patch Configuration block */
+       hw->eeprom.ops.read(hw, (fw_offset +
+                                IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR),
+                                &fw_ptp_cfg_offset);
+
+       if ((fw_ptp_cfg_offset == 0) || (fw_ptp_cfg_offset == 0xFFFF))
+               goto fw_version_out;
+
+       /* get the firmware version */
+       hw->eeprom.ops.read(hw, (fw_ptp_cfg_offset +
+                                IXGBE_FW_PATCH_VERSION_4),
+                                &fw_version);
+
+       if (fw_version > 0x5)
+               status = 0;
+
+fw_version_out:
+       return status;
+}
+
 static struct ixgbe_mac_operations mac_ops_82599 = {
        .init_hw                = &ixgbe_init_hw_generic,
        .reset_hw               = &ixgbe_reset_hw_82599,
@@ -1253,6 +2468,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
        .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82599,
        .enable_rx_dma          = &ixgbe_enable_rx_dma_82599,
        .get_mac_addr           = &ixgbe_get_mac_addr_generic,
+       .get_san_mac_addr       = &ixgbe_get_san_mac_addr_82599,
+       .get_device_caps        = &ixgbe_get_device_caps_82599,
        .stop_adapter           = &ixgbe_stop_adapter_generic,
        .get_bus_info           = &ixgbe_get_bus_info_generic,
        .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie,
@@ -1264,8 +2481,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
        .get_link_capabilities  = &ixgbe_get_link_capabilities_82599,
        .led_on                 = &ixgbe_led_on_generic,
        .led_off                = &ixgbe_led_off_generic,
-       .blink_led_start        = &ixgbe_blink_led_start_82599,
-       .blink_led_stop         = &ixgbe_blink_led_stop_82599,
+       .blink_led_start        = &ixgbe_blink_led_start_generic,
+       .blink_led_stop         = &ixgbe_blink_led_stop_generic,
        .set_rar                = &ixgbe_set_rar_generic,
        .clear_rar              = &ixgbe_clear_rar_generic,
        .set_vmdq               = &ixgbe_set_vmdq_82599,
@@ -1277,7 +2494,7 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
        .disable_mc             = &ixgbe_disable_mc_generic,
        .clear_vfta             = &ixgbe_clear_vfta_82599,
        .set_vfta               = &ixgbe_set_vfta_82599,
-       .setup_fc               = &ixgbe_setup_fc_generic,
+       .fc_enable               = &ixgbe_fc_enable_generic,
        .init_uta_tables        = &ixgbe_init_uta_tables_82599,
        .setup_sfp              = &ixgbe_setup_sfp_modules_82599,
 };