ixgbe/base: minor changes
[dpdk.git] / lib / librte_pmd_ixgbe / ixgbe / ixgbe_x540.c
index d6fdcc4..3ab2184 100644 (file)
@@ -1,36 +1,35 @@
-/******************************************************************************
-
-  Copyright (c) 2001-2010, Intel Corporation 
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without 
-  modification, are permitted provided that the following conditions are met:
-  
-   1. Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-  
-   2. Redistributions in binary form must reproduce the above copyright 
-      notice, this list of conditions and the following disclaimer in the 
-      documentation and/or other materials provided with the distribution.
-  
-   3. Neither the name of the Intel Corporation nor the names of its 
-      contributors may be used to endorse or promote products derived from 
-      this software without specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-******************************************************************************/
-/*$FreeBSD$*/
+/*******************************************************************************
+
+Copyright (c) 2001-2014, Intel Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the Intel Corporation nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+***************************************************************************/
 
 #include "ixgbe_x540.h"
 #include "ixgbe_type.h"
 #include "ixgbe_common.h"
 #include "ixgbe_phy.h"
 
-s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw);
-s32 ixgbe_get_link_capabilities_X540(struct ixgbe_hw *hw,
-                                      ixgbe_link_speed *speed,
-                                      bool *autoneg);
-enum ixgbe_media_type ixgbe_get_media_type_X540(struct ixgbe_hw *hw);
-s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
-                               ixgbe_link_speed speed,
-                               bool autoneg, bool link_up_wait_to_complete);
-s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw);
-s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw);
-u32 ixgbe_get_supported_physical_layer_X540(struct ixgbe_hw *hw);
-
-s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw);
-s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data);
-s32 ixgbe_read_eerd_buffer_X540(struct ixgbe_hw *hw,
-                                u16 offset, u16 words, u16 *data);
-s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data);
-s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw,
-                                 u16 offset, u16 words, u16 *data);
-s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw);
-s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw, u16 *checksum_val);
-u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw);
-
-s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
-void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
+#define IXGBE_X540_MAX_TX_QUEUES       128
+#define IXGBE_X540_MAX_RX_QUEUES       128
+#define IXGBE_X540_RAR_ENTRIES         128
+#define IXGBE_X540_MC_TBL_SIZE         128
+#define IXGBE_X540_VFT_TBL_SIZE                128
+#define IXGBE_X540_RX_PB_SIZE          384
 
-static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw);
-static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw);
-static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw);
-static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw);
+STATIC s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw);
+STATIC s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw);
+STATIC void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw);
 
 /**
  *  ixgbe_init_ops_X540 - Inits func ptrs and MAC type
  *  @hw: pointer to hardware structure
  *
- *  Initialize the function pointers and assign the MAC type for 82599.
+ *  Initialize the function pointers and assign the MAC type for X540.
  *  Does not touch the hardware.
  **/
 s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw)
@@ -90,60 +69,66 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw)
 
 
        /* EEPROM */
-       eeprom->ops.init_params = &ixgbe_init_eeprom_params_X540;
-       eeprom->ops.read = &ixgbe_read_eerd_X540;
-       eeprom->ops.read_buffer = &ixgbe_read_eerd_buffer_X540;
-       eeprom->ops.write = &ixgbe_write_eewr_X540;
-       eeprom->ops.write_buffer = &ixgbe_write_eewr_buffer_X540;
-       eeprom->ops.update_checksum = &ixgbe_update_eeprom_checksum_X540;
-       eeprom->ops.validate_checksum = &ixgbe_validate_eeprom_checksum_X540;
-       eeprom->ops.calc_checksum = &ixgbe_calc_eeprom_checksum_X540;
+       eeprom->ops.init_params = ixgbe_init_eeprom_params_X540;
+       eeprom->ops.read = ixgbe_read_eerd_X540;
+       eeprom->ops.read_buffer = ixgbe_read_eerd_buffer_X540;
+       eeprom->ops.write = ixgbe_write_eewr_X540;
+       eeprom->ops.write_buffer = ixgbe_write_eewr_buffer_X540;
+       eeprom->ops.update_checksum = ixgbe_update_eeprom_checksum_X540;
+       eeprom->ops.validate_checksum = ixgbe_validate_eeprom_checksum_X540;
+       eeprom->ops.calc_checksum = ixgbe_calc_eeprom_checksum_X540;
 
        /* PHY */
-       phy->ops.init = &ixgbe_init_phy_ops_generic;
+       phy->ops.init = ixgbe_init_phy_ops_generic;
        phy->ops.reset = NULL;
 
        /* MAC */
-       mac->ops.reset_hw = &ixgbe_reset_hw_X540;
-       mac->ops.enable_relaxed_ordering = &ixgbe_enable_relaxed_ordering_gen2;
-       mac->ops.get_media_type = &ixgbe_get_media_type_X540;
+       mac->ops.reset_hw = ixgbe_reset_hw_X540;
+       mac->ops.enable_relaxed_ordering = ixgbe_enable_relaxed_ordering_gen2;
+       mac->ops.get_media_type = ixgbe_get_media_type_X540;
        mac->ops.get_supported_physical_layer =
-                                   &ixgbe_get_supported_physical_layer_X540;
+                                   ixgbe_get_supported_physical_layer_X540;
        mac->ops.read_analog_reg8 = NULL;
        mac->ops.write_analog_reg8 = NULL;
-       mac->ops.start_hw = &ixgbe_start_hw_X540;
-       mac->ops.get_san_mac_addr = &ixgbe_get_san_mac_addr_generic;
-       mac->ops.set_san_mac_addr = &ixgbe_set_san_mac_addr_generic;
-       mac->ops.get_device_caps = &ixgbe_get_device_caps_generic;
-       mac->ops.get_wwn_prefix = &ixgbe_get_wwn_prefix_generic;
-       mac->ops.get_fcoe_boot_status = &ixgbe_get_fcoe_boot_status_generic;
-       mac->ops.acquire_swfw_sync = &ixgbe_acquire_swfw_sync_X540;
-       mac->ops.release_swfw_sync = &ixgbe_release_swfw_sync_X540;
+       mac->ops.start_hw = ixgbe_start_hw_X540;
+       mac->ops.get_san_mac_addr = ixgbe_get_san_mac_addr_generic;
+       mac->ops.set_san_mac_addr = ixgbe_set_san_mac_addr_generic;
+       mac->ops.get_device_caps = ixgbe_get_device_caps_generic;
+       mac->ops.get_wwn_prefix = ixgbe_get_wwn_prefix_generic;
+       mac->ops.get_fcoe_boot_status = ixgbe_get_fcoe_boot_status_generic;
+       mac->ops.acquire_swfw_sync = ixgbe_acquire_swfw_sync_X540;
+       mac->ops.release_swfw_sync = ixgbe_release_swfw_sync_X540;
+       mac->ops.disable_sec_rx_path = ixgbe_disable_sec_rx_path_generic;
+       mac->ops.enable_sec_rx_path = ixgbe_enable_sec_rx_path_generic;
 
        /* RAR, Multicast, VLAN */
-       mac->ops.set_vmdq = &ixgbe_set_vmdq_generic;
-       mac->ops.clear_vmdq = &ixgbe_clear_vmdq_generic;
-       mac->ops.insert_mac_addr = &ixgbe_insert_mac_addr_generic;
+       mac->ops.set_vmdq = ixgbe_set_vmdq_generic;
+       mac->ops.set_vmdq_san_mac = ixgbe_set_vmdq_san_mac_generic;
+       mac->ops.clear_vmdq = ixgbe_clear_vmdq_generic;
+       mac->ops.insert_mac_addr = ixgbe_insert_mac_addr_generic;
        mac->rar_highwater = 1;
-       mac->ops.set_vfta = &ixgbe_set_vfta_generic;
-       mac->ops.clear_vfta = &ixgbe_clear_vfta_generic;
-       mac->ops.init_uta_tables = &ixgbe_init_uta_tables_generic;
-       mac->ops.set_mac_anti_spoofing = &ixgbe_set_mac_anti_spoofing;
-       mac->ops.set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing;
+       mac->ops.set_vfta = ixgbe_set_vfta_generic;
+       mac->ops.set_vlvf = ixgbe_set_vlvf_generic;
+       mac->ops.clear_vfta = ixgbe_clear_vfta_generic;
+       mac->ops.init_uta_tables = ixgbe_init_uta_tables_generic;
+       mac->ops.set_mac_anti_spoofing = ixgbe_set_mac_anti_spoofing;
+       mac->ops.set_vlan_anti_spoofing = ixgbe_set_vlan_anti_spoofing;
 
        /* Link */
-       mac->ops.get_link_capabilities = &ixgbe_get_copper_link_capabilities_generic;
-       mac->ops.setup_link = &ixgbe_setup_mac_link_X540;
-       mac->ops.setup_rxpba = &ixgbe_set_rxpba_generic;
-       mac->ops.check_link = &ixgbe_check_mac_link_generic;
-
-       mac->mcft_size        = 128;
-       mac->vft_size         = 128;
-       mac->num_rar_entries  = 128;
-       mac->rx_pb_size       = 384;
-       mac->max_tx_queues    = 128;
-       mac->max_rx_queues    = 128;
-       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
+       mac->ops.get_link_capabilities =
+                               ixgbe_get_copper_link_capabilities_generic;
+       mac->ops.setup_link = ixgbe_setup_mac_link_X540;
+       mac->ops.setup_rxpba = ixgbe_set_rxpba_generic;
+       mac->ops.check_link = ixgbe_check_mac_link_generic;
+
+
+       mac->mcft_size          = IXGBE_X540_MC_TBL_SIZE;
+       mac->vft_size           = IXGBE_X540_VFT_TBL_SIZE;
+       mac->num_rar_entries    = IXGBE_X540_RAR_ENTRIES;
+       mac->rx_pb_size         = IXGBE_X540_RX_PB_SIZE;
+       mac->max_rx_queues      = IXGBE_X540_MAX_RX_QUEUES;
+       mac->max_tx_queues      = IXGBE_X540_MAX_TX_QUEUES;
+       mac->max_msix_vectors   = ixgbe_get_pcie_msix_count_generic(hw);
 
        /*
         * FWSM register
@@ -151,7 +136,7 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw)
         * enabled.
         */
        mac->arc_subsystem_valid = (IXGBE_READ_REG(hw, IXGBE_FWSM) &
-                                  IXGBE_FWSM_MODE_MASK) ? TRUE : FALSE;
+                                  IXGBE_FWSM_MODE_MASK) ? true : false;
 
        hw->mbx.ops.init_params = ixgbe_init_mbx_params_pf;
 
@@ -160,7 +145,9 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw)
        mac->ops.blink_led_stop = ixgbe_blink_led_stop_X540;
 
        /* Manageability interface */
-       mac->ops.set_fw_drv_ver = &ixgbe_set_fw_drv_ver_generic;
+       mac->ops.set_fw_drv_ver = ixgbe_set_fw_drv_ver_generic;
+
+       mac->ops.get_rtrup2tc = ixgbe_dcb_get_rtrup2tc_generic;
 
        return ret_val;
 }
@@ -169,15 +156,15 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw *hw)
  *  ixgbe_get_link_capabilities_X540 - Determines link capabilities
  *  @hw: pointer to hardware structure
  *  @speed: pointer to link speed
- *  @negotiation: TRUE when autoneg or autotry is enabled
+ *  @autoneg: true when autoneg or autotry is enabled
  *
  *  Determines the link capabilities by reading the AUTOC register.
  **/
 s32 ixgbe_get_link_capabilities_X540(struct ixgbe_hw *hw,
-                                     ixgbe_link_speed *speed,
-                                     bool *negotiation)
+                                    ixgbe_link_speed *speed,
+                                    bool *autoneg)
 {
-       ixgbe_get_copper_link_capabilities_generic(hw, speed, negotiation);
+       ixgbe_get_copper_link_capabilities_generic(hw, speed, autoneg);
 
        return IXGBE_SUCCESS;
 }
@@ -198,16 +185,14 @@ enum ixgbe_media_type ixgbe_get_media_type_X540(struct ixgbe_hw *hw)
  *  ixgbe_setup_mac_link_X540 - Sets the auto advertised capabilities
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
- *  @autoneg: TRUE if autonegotiation enabled
- *  @autoneg_wait_to_complete: TRUE when waiting for completion is needed
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
  **/
 s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
-                                     ixgbe_link_speed speed, bool autoneg,
-                                     bool autoneg_wait_to_complete)
+                             ixgbe_link_speed speed,
+                             bool autoneg_wait_to_complete)
 {
        DEBUGFUNC("ixgbe_setup_mac_link_X540");
-       return hw->phy.ops.setup_link_speed(hw, speed, autoneg,
-                                           autoneg_wait_to_complete);
+       return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait_to_complete);
 }
 
 /**
@@ -248,7 +233,8 @@ mac_reset_top:
 
        if (ctrl & IXGBE_CTRL_RST_MASK) {
                status = IXGBE_ERR_RESET_FAILED;
-               DEBUGOUT("Reset polling failed to complete.\n");
+               ERROR_REPORT1(IXGBE_ERROR_POLLING,
+                            "Reset polling failed to complete.\n");
        }
        msec_delay(100);
 
@@ -282,7 +268,10 @@ mac_reset_top:
        /* 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);
+                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
+
+               /* Save the SAN MAC RAR index */
+               hw->mac.san_mac_rar_index = hw->mac.num_rar_entries - 1;
 
                /* Reserve the last RAR for the SAN MAC address */
                hw->mac.num_rar_entries--;
@@ -290,7 +279,7 @@ mac_reset_top:
 
        /* Store the alternative WWNN/WWPN prefix */
        hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
-                                      &hw->mac.wwpn_prefix);
+                                  &hw->mac.wwpn_prefix);
 
 reset_hw_out:
        return status;
@@ -366,12 +355,12 @@ s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw)
 
                eec = IXGBE_READ_REG(hw, IXGBE_EEC);
                eeprom_size = (u16)((eec & IXGBE_EEC_SIZE) >>
-                                   IXGBE_EEC_SIZE_SHIFT);
+                                   IXGBE_EEC_SIZE_SHIFT);
                eeprom->word_size = 1 << (eeprom_size +
-                                         IXGBE_EEPROM_WORD_SIZE_SHIFT);
+                                         IXGBE_EEPROM_WORD_SIZE_SHIFT);
 
                DEBUGOUT2("Eeprom params: type = %d, size = %d\n",
-                         eeprom->type, eeprom->word_size);
+                         eeprom->type, eeprom->word_size);
        }
 
        return IXGBE_SUCCESS;
@@ -391,12 +380,13 @@ s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data)
 
        DEBUGFUNC("ixgbe_read_eerd_X540");
        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS)
+           IXGBE_SUCCESS) {
                status = ixgbe_read_eerd_generic(hw, offset, data);
-       else
+               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       } else {
                status = IXGBE_ERR_SWFW_SYNC;
+       }
 
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
        return status;
 }
 
@@ -410,19 +400,20 @@ s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data)
  *  Reads a 16 bit word(s) from the EEPROM using the EERD register.
  **/
 s32 ixgbe_read_eerd_buffer_X540(struct ixgbe_hw *hw,
-                                u16 offset, u16 words, u16 *data)
+                               u16 offset, u16 words, u16 *data)
 {
        s32 status = IXGBE_SUCCESS;
 
        DEBUGFUNC("ixgbe_read_eerd_buffer_X540");
        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS)
+           IXGBE_SUCCESS) {
                status = ixgbe_read_eerd_buffer_generic(hw, offset,
-                                                       words, data);
-       else
+                                                       words, data);
+               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       } else {
                status = IXGBE_ERR_SWFW_SYNC;
+       }
 
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
        return status;
 }
 
@@ -440,12 +431,13 @@ s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data)
 
        DEBUGFUNC("ixgbe_write_eewr_X540");
        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS)
+           IXGBE_SUCCESS) {
                status = ixgbe_write_eewr_generic(hw, offset, data);
-       else
+               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       } else {
                status = IXGBE_ERR_SWFW_SYNC;
+       }
 
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
        return status;
 }
 
@@ -459,19 +451,20 @@ s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data)
  *  Write a 16 bit word(s) to the EEPROM using the EEWR register.
  **/
 s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw,
-                                 u16 offset, u16 words, u16 *data)
+                                u16 offset, u16 words, u16 *data)
 {
        s32 status = IXGBE_SUCCESS;
 
        DEBUGFUNC("ixgbe_write_eewr_buffer_X540");
        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS)
+           IXGBE_SUCCESS) {
                status = ixgbe_write_eewr_buffer_generic(hw, offset,
-                                                        words, data);
-       else
+                                                        words, data);
+               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       } else {
                status = IXGBE_ERR_SWFW_SYNC;
+       }
 
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
        return status;
 }
 
@@ -482,18 +475,20 @@ s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw,
  *  be used internally by function which utilize ixgbe_acquire_swfw_sync_X540.
  *
  *  @hw: pointer to hardware structure
+ *
+ *  Returns a negative error code on error, or the 16-bit checksum
  **/
-u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
+s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
 {
-       u16 i;
-       u16 j;
+       u16 i, j;
        u16 checksum = 0;
        u16 length = 0;
        u16 pointer = 0;
        u16 word = 0;
+       u16 checksum_last_word = IXGBE_EEPROM_CHECKSUM;
+       u16 ptr_start = IXGBE_PCIE_ANALOG_PTR;
 
-       /*
-        * Do not use hw->eeprom.ops.read because we do not want to take
+       /* Do not use hw->eeprom.ops.read because we do not want to take
         * the synchronization semaphores here. Instead use
         * ixgbe_read_eerd_generic
         */
@@ -501,25 +496,25 @@ u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
        DEBUGFUNC("ixgbe_calc_eeprom_checksum_X540");
 
        /* Include 0x0-0x3F in the checksum */
-       for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
-               if (ixgbe_read_eerd_generic(hw, i, &word) != IXGBE_SUCCESS) {
+       for (i = 0; i <= checksum_last_word; i++) {
+               if (ixgbe_read_eerd_generic(hw, i, &word)) {
                        DEBUGOUT("EEPROM read failed\n");
-                       break;
+                       return IXGBE_ERR_EEPROM;
                }
-               checksum += word;
+               if (i != IXGBE_EEPROM_CHECKSUM)
+                       checksum += word;
        }
 
-       /*
-        * Include all data from pointers 0x3, 0x6-0xE.  This excludes the
+       /* Include all data from pointers 0x3, 0x6-0xE.  This excludes the
         * FW, PHY module, and PCIe Expansion/Option ROM pointers.
         */
-       for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {
+       for (i = ptr_start; i < IXGBE_FW_PTR; i++) {
                if (i == IXGBE_PHY_PTR || i == IXGBE_OPTION_ROM_PTR)
                        continue;
 
-               if (ixgbe_read_eerd_generic(hw, i, &pointer) != IXGBE_SUCCESS) {
+               if (ixgbe_read_eerd_generic(hw, i, &pointer)) {
                        DEBUGOUT("EEPROM read failed\n");
-                       break;
+                       return IXGBE_ERR_EEPROM;
                }
 
                /* Skip pointer section if the pointer is invalid. */
@@ -527,10 +522,9 @@ u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
                    pointer >= hw->eeprom.word_size)
                        continue;
 
-               if (ixgbe_read_eerd_generic(hw, pointer, &length)!=
-                   IXGBE_SUCCESS) {
+               if (ixgbe_read_eerd_generic(hw, pointer, &length)) {
                        DEBUGOUT("EEPROM read failed\n");
-                       break;
+                       return IXGBE_ERR_EEPROM;
                }
 
                /* Skip pointer section if length is invalid. */
@@ -538,11 +532,10 @@ u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
                    (pointer + length) >= hw->eeprom.word_size)
                        continue;
 
-               for (j = pointer+1; j <= pointer+length; j++) {
-                       if (ixgbe_read_eerd_generic(hw, j, &word) !=
-                           IXGBE_SUCCESS) {
+               for (j = pointer + 1; j <= pointer + length; j++) {
+                       if (ixgbe_read_eerd_generic(hw, j, &word)) {
                                DEBUGOUT("EEPROM read failed\n");
-                               break;
+                               return IXGBE_ERR_EEPROM;
                        }
                        checksum += word;
                }
@@ -550,7 +543,7 @@ u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
 
        checksum = (u16)IXGBE_EEPROM_SUM - checksum;
 
-       return checksum;
+       return (s32)checksum;
 }
 
 /**
@@ -562,7 +555,7 @@ u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
  *  caller does not need checksum_val, the value can be NULL.
  **/
 s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw,
-                                        u16 *checksum_val)
+                                       u16 *checksum_val)
 {
        s32 status;
        u16 checksum;
@@ -570,45 +563,49 @@ s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw,
 
        DEBUGFUNC("ixgbe_validate_eeprom_checksum_X540");
 
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
+       /* Read the first word from the EEPROM. If this times out or fails, do
         * not continue or we could be in for a very long wait while every
         * EEPROM read fails
         */
        status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status != IXGBE_SUCCESS) {
+       if (status) {
                DEBUGOUT("EEPROM read failed\n");
-               goto out;
+               return status;
        }
 
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM))
+               return IXGBE_ERR_SWFW_SYNC;
 
-               /*
-                * Do not use hw->eeprom.ops.read because we do not want to take
-                * the synchronization semaphores twice here.
-               */
-               ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM,
-                                       &read_checksum);
+       status = hw->eeprom.ops.calc_checksum(hw);
+       if (status < 0)
+               goto out;
 
-               /*
-                * Verify read checksum from EEPROM is the same as
-                * calculated checksum
-                */
-               if (read_checksum != checksum)
-                       status = IXGBE_ERR_EEPROM_CHECKSUM;
+       checksum = (u16)(status & 0xffff);
 
-               /* If the user cares, return the calculated checksum */
-               if (checksum_val)
-                       *checksum_val = checksum;
-       } else {
-               status = IXGBE_ERR_SWFW_SYNC;
+       /* Do not use hw->eeprom.ops.read because we do not want to take
+        * the synchronization semaphores twice here.
+        */
+       status = ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM,
+                                        &read_checksum);
+       if (status)
+               goto out;
+
+       /* Verify read checksum from EEPROM is the same as
+        * calculated checksum
+        */
+       if (read_checksum != checksum) {
+               ERROR_REPORT1(IXGBE_ERROR_INVALID_STATE,
+                            "Invalid EEPROM checksum");
+               status = IXGBE_ERR_EEPROM_CHECKSUM;
        }
 
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       /* If the user cares, return the calculated checksum */
+       if (checksum_val)
+               *checksum_val = checksum;
+
 out:
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+
        return status;
 }
 
@@ -627,33 +624,35 @@ s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw)
 
        DEBUGFUNC("ixgbe_update_eeprom_checksum_X540");
 
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
+       /* Read the first word from the EEPROM. If this times out or fails, do
         * not continue or we could be in for a very long wait while every
         * EEPROM read fails
         */
        status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status != IXGBE_SUCCESS)
+       if (status) {
                DEBUGOUT("EEPROM read failed\n");
+               return status;
+       }
 
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           IXGBE_SUCCESS) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM))
+               return IXGBE_ERR_SWFW_SYNC;
 
-               /*
-                * Do not use hw->eeprom.ops.write because we do not want to
-                * take the synchronization semaphores twice here.
-               */
-               status = ixgbe_write_eewr_generic(hw, IXGBE_EEPROM_CHECKSUM,
-                                                 checksum);
+       status = hw->eeprom.ops.calc_checksum(hw);
+       if (status < 0)
+               goto out;
 
-       if (status == IXGBE_SUCCESS)
-               status = ixgbe_update_flash_X540(hw);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-       }
+       checksum = (u16)(status & 0xffff);
 
+       /* Do not use hw->eeprom.ops.write because we do not want to
+        * take the synchronization semaphores twice here.
+        */
+       status = ixgbe_write_eewr_generic(hw, IXGBE_EEPROM_CHECKSUM, checksum);
+       if (status)
+               goto out;
+
+       status = ixgbe_update_flash_X540(hw);
+
+out:
        hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
 
        return status;
@@ -666,10 +665,10 @@ s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw)
  *  Set FLUP (bit 23) of the EEC register to instruct Hardware to copy
  *  EEPROM from shadow RAM to the flash device.
  **/
-static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw)
+s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw)
 {
        u32 flup;
-       s32 status = IXGBE_ERR_EEPROM;
+       s32 status;
 
        DEBUGFUNC("ixgbe_update_flash_X540");
 
@@ -688,7 +687,7 @@ static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw)
        else
                DEBUGOUT("Flash update time out\n");
 
-       if (hw->revision_id == 0) {
+       if (hw->mac.type == ixgbe_mac_X540 && hw->revision_id == 0) {
                flup = IXGBE_READ_REG(hw, IXGBE_EEC);
 
                if (flup & IXGBE_EEC_SEC1VAL) {
@@ -713,7 +712,7 @@ out:
  *  Polls the FLUDONE (bit 26) of the EEC Register to determine when the
  *  flash update is done.
  **/
-static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
+STATIC s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
 {
        u32 i;
        u32 reg;
@@ -727,11 +726,36 @@ static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
                        status = IXGBE_SUCCESS;
                        break;
                }
-               usec_delay(5);
+               msec_delay(5);
        }
+
+       if (i == IXGBE_FLUDONE_ATTEMPTS)
+               ERROR_REPORT1(IXGBE_ERROR_POLLING,
+                            "Flash update status polling timed out");
+
        return status;
 }
 
+/**
+ * ixgbe_set_mux - Set mux for port 1 access with CS4227
+ * @hw: pointer to hardware structure
+ * @state: set mux if 1, clear if 0
+ */
+STATIC void ixgbe_set_mux(struct ixgbe_hw *hw, u8 state)
+{
+       u32 esdp;
+
+       if (!hw->phy.lan_id)
+               return;
+       esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
+       if (state)
+               esdp |= IXGBE_ESDP_SDP1;
+       else
+               esdp &= ~IXGBE_ESDP_SDP1;
+       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp);
+       IXGBE_WRITE_FLUSH(hw);
+}
+
 /**
  *  ixgbe_acquire_swfw_sync_X540 - Acquire SWFW semaphore
  *  @hw: pointer to hardware structure
@@ -740,34 +764,33 @@ static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
  *  Acquires the SWFW semaphore thought the SW_FW_SYNC register for
  *  the specified function (CSR, PHY0, PHY1, NVM, Flash)
  **/
-s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
+s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask)
 {
-       u32 swfw_sync;
-       u32 swmask = mask;
-       u32 fwmask = mask << 5;
-       u32 hwmask = 0;
+       u32 swmask = mask & IXGBE_GSSR_NVM_PHY_MASK;
+       u32 fwmask = swmask << 5;
+       u32 swi2c_mask = mask & IXGBE_GSSR_I2C_MASK;
        u32 timeout = 200;
+       u32 hwmask = 0;
+       u32 swfw_sync;
        u32 i;
-       s32 ret_val = IXGBE_SUCCESS;
 
        DEBUGFUNC("ixgbe_acquire_swfw_sync_X540");
 
-       if (swmask == IXGBE_GSSR_EEP_SM)
-               hwmask = IXGBE_GSSR_FLASH_SM;
+       if (swmask & IXGBE_GSSR_EEP_SM)
+               hwmask |= IXGBE_GSSR_FLASH_SM;
 
        /* SW only mask doesn't have FW bit pair */
-       if (swmask == IXGBE_GSSR_SW_MNG_SM)
-               fwmask = 0;
+       if (mask & IXGBE_GSSR_SW_MNG_SM)
+               swmask |= IXGBE_GSSR_SW_MNG_SM;
 
+       swmask |= swi2c_mask;
+       fwmask |= swi2c_mask << 2;
        for (i = 0; i < timeout; i++) {
-               /*
-                * SW NVM semaphore bit is used for access to all
+               /* SW NVM semaphore bit is used for access to all
                 * SW_FW_SYNC bits (not just NVM)
                 */
-               if (ixgbe_get_swfw_sync_semaphore(hw)) {
-                       ret_val = IXGBE_ERR_SWFW_SYNC;
-                       goto out;
-               }
+               if (ixgbe_get_swfw_sync_semaphore(hw))
+                       return IXGBE_ERR_SWFW_SYNC;
 
                swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
                if (!(swfw_sync & (fwmask | swmask | hwmask))) {
@@ -775,44 +798,60 @@ s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
                        IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
                        ixgbe_release_swfw_sync_semaphore(hw);
                        msec_delay(5);
-                       goto out;
-               } else {
-                       /*
-                        * Firmware currently using resource (fwmask), hardware currently
-                        * using resource (hwmask), or other software thread currently
-                        * using resource (swmask)
-                        */
-                       ixgbe_release_swfw_sync_semaphore(hw);
-                       msec_delay(5);
+                       if (swi2c_mask)
+                               ixgbe_set_mux(hw, 1);
+                       return IXGBE_SUCCESS;
                }
+               /* Firmware currently using resource (fwmask), hardware
+                * currently using resource (hwmask), or other software
+                * thread currently using resource (swmask)
+                */
+               ixgbe_release_swfw_sync_semaphore(hw);
+               msec_delay(5);
        }
 
        /* Failed to get SW only semaphore */
        if (swmask == IXGBE_GSSR_SW_MNG_SM) {
-               ret_val = IXGBE_ERR_SWFW_SYNC;
-               goto out;
+               ERROR_REPORT1(IXGBE_ERROR_POLLING,
+                            "Failed to get SW only semaphore");
+               return IXGBE_ERR_SWFW_SYNC;
        }
 
        /* If the resource is not released by the FW/HW the SW can assume that
-        * the FW/HW malfunctions. In that case the SW should sets the SW bit(s)
+        * the FW/HW malfunctions. In that case the SW should set the SW bit(s)
         * of the requested resource(s) while ignoring the corresponding FW/HW
         * bits in the SW_FW_SYNC register.
         */
+       if (ixgbe_get_swfw_sync_semaphore(hw))
+               return IXGBE_ERR_SWFW_SYNC;
        swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-       if (swfw_sync & (fwmask| hwmask)) {
-               if (ixgbe_get_swfw_sync_semaphore(hw)) {
-                       ret_val = IXGBE_ERR_SWFW_SYNC;
-                       goto out;
-               }
-
+       if (swfw_sync & (fwmask | hwmask)) {
                swfw_sync |= swmask;
                IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
                ixgbe_release_swfw_sync_semaphore(hw);
                msec_delay(5);
+               if (swi2c_mask)
+                       ixgbe_set_mux(hw, 1);
+               return IXGBE_SUCCESS;
        }
+       /* If the resource is not released by other SW the SW can assume that
+        * the other SW malfunctions. In that case the SW should clear all SW
+        * flags that it does not own and then repeat the whole process once
+        * again.
+        */
+       if (swfw_sync & swmask) {
+               u32 rmask = IXGBE_GSSR_EEP_SM | IXGBE_GSSR_PHY0_SM |
+                           IXGBE_GSSR_PHY1_SM | IXGBE_GSSR_MAC_CSR_SM;
 
-out:
-       return ret_val;
+               if (swi2c_mask)
+                       rmask |= IXGBE_GSSR_I2C_MASK;
+               ixgbe_release_swfw_sync_X540(hw, rmask);
+               ixgbe_release_swfw_sync_semaphore(hw);
+               return IXGBE_ERR_SWFW_SYNC;
+       }
+       ixgbe_release_swfw_sync_semaphore(hw);
+
+       return IXGBE_ERR_SWFW_SYNC;
 }
 
 /**
@@ -820,16 +859,20 @@ out:
  *  @hw: pointer to hardware structure
  *  @mask: Mask to specify which semaphore to release
  *
- *  Releases the SWFW semaphore throught the SW_FW_SYNC register
+ *  Releases the SWFW semaphore through the SW_FW_SYNC register
  *  for the specified function (CSR, PHY0, PHY1, EVM, Flash)
  **/
-void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
+void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask)
 {
+       u32 swmask = mask & (IXGBE_GSSR_NVM_PHY_MASK | IXGBE_GSSR_SW_MNG_SM);
        u32 swfw_sync;
-       u32 swmask = mask;
 
        DEBUGFUNC("ixgbe_release_swfw_sync_X540");
 
+       if (mask & IXGBE_GSSR_I2C_MASK) {
+               swmask |= mask & IXGBE_GSSR_I2C_MASK;
+               ixgbe_set_mux(hw, 0);
+       }
        ixgbe_get_swfw_sync_semaphore(hw);
 
        swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
@@ -841,12 +884,12 @@ void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
 }
 
 /**
- *  ixgbe_get_nvm_semaphore - Get hardware semaphore
+ *  ixgbe_get_swfw_sync_semaphore - Get hardware semaphore
  *  @hw: pointer to hardware structure
  *
  *  Sets the hardware semaphores so SW/FW can gain control of shared resources
  **/
-static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
+STATIC s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
 {
        s32 status = IXGBE_ERR_EEPROM;
        u32 timeout = 2000;
@@ -884,25 +927,27 @@ static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
                 * was not granted because we don't have access to the EEPROM
                 */
                if (i >= timeout) {
-                       DEBUGOUT("REGSMP Software NVM semaphore not granted.\n");
+                       ERROR_REPORT1(IXGBE_ERROR_POLLING,
+                               "REGSMP Software NVM semaphore not granted.\n");
                        ixgbe_release_swfw_sync_semaphore(hw);
                        status = IXGBE_ERR_EEPROM;
                }
        } else {
-               DEBUGOUT("Software semaphore SMBI between device drivers "
-                        "not granted.\n");
+               ERROR_REPORT1(IXGBE_ERROR_POLLING,
+                            "Software semaphore SMBI between device drivers "
+                            "not granted.\n");
        }
 
        return status;
 }
 
 /**
- *  ixgbe_release_nvm_semaphore - Release hardware semaphore
+ *  ixgbe_release_swfw_sync_semaphore - Release hardware semaphore
  *  @hw: pointer to hardware structure
  *
  *  This function clears hardware semaphore bits.
  **/
-static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw)
+STATIC void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw)
 {
        u32 swsm;
 
@@ -933,18 +978,22 @@ s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index)
 {
        u32 macc_reg;
        u32 ledctl_reg;
+       ixgbe_link_speed speed;
+       bool link_up;
 
        DEBUGFUNC("ixgbe_blink_led_start_X540");
 
        /*
-        * In order for the blink bit in the LED control register
-        * to work, link and speed must be forced in the MAC. We
-        * will reverse this when we stop the blinking.
+        * Link should be up in order for the blink bit in the LED control
+        * register to work. Force link and speed in the MAC if link is down.
+        * This will be reversed when we stop the blinking.
         */
-       macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
-       macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;
-       IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
-
+       hw->mac.ops.check_link(hw, &speed, &link_up, false);
+       if (link_up == false) {
+               macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
+               macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;
+               IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
+       }
        /* Set the LED to LINK_UP + BLINK. */
        ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
        ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);