app/pdump: fix type casting of ring size
[dpdk.git] / drivers / net / ixgbe / base / ixgbe_x550.c
index 1571b14..0bbaa55 100644 (file)
@@ -39,6 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "ixgbe_phy.h"
 
 STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed);
+static s32 ixgbe_acquire_swfw_sync_X550a(struct ixgbe_hw *, u32 mask);
+static void ixgbe_release_swfw_sync_X550a(struct ixgbe_hw *, u32 mask);
 
 /**
  *  ixgbe_init_ops_X550 - Inits func ptrs and MAC type
@@ -102,7 +104,7 @@ s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw)
  **/
 STATIC s32 ixgbe_read_cs4227(struct ixgbe_hw *hw, u16 reg, u16 *value)
 {
-       return ixgbe_read_i2c_combined_unlocked(hw, IXGBE_CS4227, reg, value);
+       return hw->link.ops.read_link_unlocked(hw, hw->link.addr, reg, value);
 }
 
 /**
@@ -115,7 +117,7 @@ STATIC s32 ixgbe_read_cs4227(struct ixgbe_hw *hw, u16 reg, u16 *value)
  **/
 STATIC s32 ixgbe_write_cs4227(struct ixgbe_hw *hw, u16 reg, u16 value)
 {
-       return ixgbe_write_i2c_combined_unlocked(hw, IXGBE_CS4227, reg, value);
+       return hw->link.ops.write_link_unlocked(hw, hw->link.addr, reg, value);
 }
 
 /**
@@ -386,6 +388,68 @@ STATIC s32 ixgbe_write_phy_reg_x550em(struct ixgbe_hw *hw, u32 reg_addr,
        return IXGBE_NOT_IMPLEMENTED;
 }
 
+/**
+ * ixgbe_read_i2c_combined_generic - Perform I2C read combined operation
+ * @hw: pointer to the hardware structure
+ * @addr: I2C bus address to read from
+ * @reg: I2C device register to read from
+ * @val: pointer to location to receive read value
+ *
+ * Returns an error code on error.
+ **/
+static s32 ixgbe_read_i2c_combined_generic(struct ixgbe_hw *hw, u8 addr,
+                                          u16 reg, u16 *val)
+{
+       return ixgbe_read_i2c_combined_generic_int(hw, addr, reg, val, true);
+}
+
+/**
+ * ixgbe_read_i2c_combined_generic_unlocked - Do I2C read combined operation
+ * @hw: pointer to the hardware structure
+ * @addr: I2C bus address to read from
+ * @reg: I2C device register to read from
+ * @val: pointer to location to receive read value
+ *
+ * Returns an error code on error.
+ **/
+static s32
+ixgbe_read_i2c_combined_generic_unlocked(struct ixgbe_hw *hw, u8 addr,
+                                        u16 reg, u16 *val)
+{
+       return ixgbe_read_i2c_combined_generic_int(hw, addr, reg, val, false);
+}
+
+/**
+ * ixgbe_write_i2c_combined_generic - Perform I2C write combined operation
+ * @hw: pointer to the hardware structure
+ * @addr: I2C bus address to write to
+ * @reg: I2C device register to write to
+ * @val: value to write
+ *
+ * Returns an error code on error.
+ **/
+static s32 ixgbe_write_i2c_combined_generic(struct ixgbe_hw *hw,
+                                           u8 addr, u16 reg, u16 val)
+{
+       return ixgbe_write_i2c_combined_generic_int(hw, addr, reg, val, true);
+}
+
+/**
+ * ixgbe_write_i2c_combined_generic_unlocked - Do I2C write combined operation
+ * @hw: pointer to the hardware structure
+ * @addr: I2C bus address to write to
+ * @reg: I2C device register to write to
+ * @val: value to write
+ *
+ * Returns an error code on error.
+ **/
+static s32
+ixgbe_write_i2c_combined_generic_unlocked(struct ixgbe_hw *hw,
+                                         u8 addr, u16 reg, u16 val)
+{
+       return ixgbe_write_i2c_combined_generic_int(hw, addr, reg, val, false);
+}
+
 /**
 *  ixgbe_init_ops_X550EM - Inits func ptrs and MAC type
 *  @hw: pointer to hardware structure
@@ -398,6 +462,7 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
        struct ixgbe_mac_info *mac = &hw->mac;
        struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
        struct ixgbe_phy_info *phy = &hw->phy;
+       struct ixgbe_link_info *link = &hw->link;
        s32 ret_val;
 
        DEBUGFUNC("ixgbe_init_ops_X550EM");
@@ -438,10 +503,19 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
                mac->ops.write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550;
                mac->ops.acquire_swfw_sync = ixgbe_acquire_swfw_sync_X550em;
                mac->ops.release_swfw_sync = ixgbe_release_swfw_sync_X550em;
+               link->ops.read_link = ixgbe_read_i2c_combined_generic;
+               link->ops.read_link_unlocked =
+                               ixgbe_read_i2c_combined_generic_unlocked;
+               link->ops.write_link = ixgbe_write_i2c_combined_generic;
+               link->ops.write_link_unlocked =
+                               ixgbe_write_i2c_combined_generic_unlocked;
+               link->addr = IXGBE_CS4227;
        }
        if (hw->mac.type == ixgbe_mac_X550EM_a) {
                mac->ops.read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550a;
                mac->ops.write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550a;
+               mac->ops.acquire_swfw_sync = ixgbe_acquire_swfw_sync_X550a;
+               mac->ops.release_swfw_sync = ixgbe_release_swfw_sync_X550a;
        }
 
        mac->ops.get_media_type = ixgbe_get_media_type_X550em;
@@ -658,7 +732,6 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
        u16 autoneg_eee_reg;
        u32 link_reg;
        s32 status;
-       u32 fuse;
 
        DEBUGFUNC("ixgbe_setup_eee_X550");
 
@@ -679,9 +752,10 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
                        hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
                                IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_eee_reg);
                } else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {
-                       /* Not supported on first revision. */
-                       fuse = IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0));
-                       if (!(fuse & IXGBE_FUSES0_REV1))
+                       /* Not supported on first revision of X550EM_x. */
+                       if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
+                           !(IXGBE_FUSES0_REV_MASK &
+                             IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
                                return IXGBE_SUCCESS;
 
                        status = ixgbe_read_iosf_sb_reg_x550(hw,
@@ -920,6 +994,63 @@ out:
        return ret;
 }
 
+/**
+ * ixgbe_get_phy_token - Get the token for shared phy access
+ * @hw: Pointer to hardware structure
+ */
+
+s32 ixgbe_get_phy_token(struct ixgbe_hw *hw)
+{
+       struct ixgbe_hic_phy_token_req token_cmd;
+       s32 status;
+
+       token_cmd.hdr.cmd = FW_PHY_TOKEN_REQ_CMD;
+       token_cmd.hdr.buf_len = FW_PHY_TOKEN_REQ_LEN;
+       token_cmd.hdr.cmd_or_resp.cmd_resv = 0;
+       token_cmd.port_number = hw->bus.lan_id;
+       token_cmd.command_type = FW_PHY_TOKEN_REQ;
+       token_cmd.pad = 0;
+       status = ixgbe_host_interface_command(hw, (u32 *)&token_cmd,
+                                             sizeof(token_cmd),
+                                             IXGBE_HI_COMMAND_TIMEOUT,
+                                             true);
+       if (status)
+               return status;
+       if (token_cmd.hdr.cmd_or_resp.ret_status == FW_PHY_TOKEN_OK)
+               return IXGBE_SUCCESS;
+       if (token_cmd.hdr.cmd_or_resp.ret_status != FW_PHY_TOKEN_RETRY)
+               return IXGBE_ERR_FW_RESP_INVALID;
+
+       return IXGBE_ERR_TOKEN_RETRY;
+}
+
+/**
+ * ixgbe_put_phy_token - Put the token for shared phy access
+ * @hw: Pointer to hardware structure
+ */
+
+s32 ixgbe_put_phy_token(struct ixgbe_hw *hw)
+{
+       struct ixgbe_hic_phy_token_req token_cmd;
+       s32 status;
+
+       token_cmd.hdr.cmd = FW_PHY_TOKEN_REQ_CMD;
+       token_cmd.hdr.buf_len = FW_PHY_TOKEN_REQ_LEN;
+       token_cmd.hdr.cmd_or_resp.cmd_resv = 0;
+       token_cmd.port_number = hw->bus.lan_id;
+       token_cmd.command_type = FW_PHY_TOKEN_REL;
+       token_cmd.pad = 0;
+       status = ixgbe_host_interface_command(hw, (u32 *)&token_cmd,
+                                             sizeof(token_cmd),
+                                             IXGBE_HI_COMMAND_TIMEOUT,
+                                             true);
+       if (status)
+               return status;
+       if (token_cmd.hdr.cmd_or_resp.ret_status == FW_PHY_TOKEN_OK)
+               return IXGBE_SUCCESS;
+       return IXGBE_ERR_FW_RESP_INVALID;
+}
+
 /**
  *  ixgbe_write_iosf_sb_reg_x550a - Writes a value to specified register
  *  of the IOSF device
@@ -1602,9 +1733,10 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
                phy->ops.setup_internal_link =
                                              ixgbe_setup_internal_phy_t_x550em;
 
-               /* setup SW LPLU only for first revision */
-               if (!(IXGBE_FUSES0_REV1 & IXGBE_READ_REG(hw,
-                                                      IXGBE_FUSES0_GROUP(0))))
+               /* setup SW LPLU only for first revision of X550EM_x */
+               if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
+                   !(IXGBE_FUSES0_REV_MASK &
+                     IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
                        phy->ops.enter_lplu = ixgbe_enter_lplu_t_x550em;
 
                phy->ops.handle_lasi = ixgbe_handle_lasi_ext_t_x550em;
@@ -1616,6 +1748,31 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
        return ret_val;
 }
 
+/**
+ * ixgbe_set_mdio_speed - Set MDIO clock speed
+ *  @hw: pointer to hardware structure
+ */
+static void ixgbe_set_mdio_speed(struct ixgbe_hw *hw)
+{
+       u32 hlreg0;
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_X550EM_X_10G_T:
+       case IXGBE_DEV_ID_X550EM_A_1G_T:
+       case IXGBE_DEV_ID_X550EM_A_1G_T_L:
+       case IXGBE_DEV_ID_X550EM_A_10G_T:
+       case IXGBE_DEV_ID_X550EM_A_SFP:
+       case IXGBE_DEV_ID_X550EM_A_QSFP:
+               /* Config MDIO clock speed before the first MDIO PHY access */
+               hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
+               hlreg0 &= ~IXGBE_HLREG0_MDCSPD;
+               IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
+               break;
+       default:
+               break;
+       }
+}
+
 /**
  *  ixgbe_reset_hw_X550em - Perform hardware reset
  *  @hw: pointer to hardware structure
@@ -1630,7 +1787,6 @@ s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)
        s32 status;
        u32 ctrl = 0;
        u32 i;
-       u32 hlreg0;
        bool link_up = false;
 
        DEBUGFUNC("ixgbe_reset_hw_X550em");
@@ -1643,12 +1799,7 @@ s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)
        /* flush pending Tx transactions */
        ixgbe_clear_tx_pending(hw);
 
-       if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T) {
-               /* Config MDIO clock speed before the first MDIO PHY access */
-               hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
-               hlreg0 &= ~IXGBE_HLREG0_MDCSPD;
-               IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
-       }
+       ixgbe_set_mdio_speed(hw);
 
        /* PHY ops must be identified and initialized prior to reset */
        status = hw->phy.ops.init(hw);
@@ -1727,6 +1878,8 @@ mac_reset_top:
        hw->mac.num_rar_entries = 128;
        hw->mac.ops.init_rx_addrs(hw);
 
+       ixgbe_set_mdio_speed(hw);
+
        if (hw->device_id == IXGBE_DEV_ID_X550EM_X_SFP)
                ixgbe_setup_mux_ctl(hw);
 
@@ -1820,22 +1973,22 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
                reg_slice = IXGBE_CS4227_LINE_SPARE22_MSB +
                            (hw->bus.lan_id << 12);
                reg_val = IXGBE_CS4227_SPEED_10G;
-               ret_val = ixgbe_write_i2c_combined(hw, IXGBE_CS4227, reg_slice,
-                                                  reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
 
                reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB +
                            (hw->bus.lan_id << 12);
                reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
-               ret_val = ixgbe_write_i2c_combined(hw, IXGBE_CS4227, reg_slice,
-                                                  reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
 
                /* Configure CS4227 for HOST connection rate then type. */
                reg_slice = IXGBE_CS4227_HOST_SPARE22_MSB +
                            (hw->bus.lan_id << 12);
                reg_val = (speed & IXGBE_LINK_SPEED_10GB_FULL) ?
                IXGBE_CS4227_SPEED_10G : IXGBE_CS4227_SPEED_1G;
-               ret_val = ixgbe_write_i2c_combined(hw, IXGBE_CS4227, reg_slice,
-                                                  reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
 
                reg_slice = IXGBE_CS4227_HOST_SPARE24_LSB +
                            (hw->bus.lan_id << 12);
@@ -1843,8 +1996,8 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
                        reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
                else
                        reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
-               ret_val = ixgbe_write_i2c_combined(hw, IXGBE_CS4227, reg_slice,
-                                                  reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
 
                /* Setup XFI internal link. */
                ret_val = ixgbe_setup_ixfi_x550em(hw, &speed);
@@ -1859,8 +2012,8 @@ s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
                        reg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
                else
                        reg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
-               ret_val = ixgbe_write_i2c_combined(hw, IXGBE_CS4227, reg_slice,
-                                                  reg_val);
+               ret_val = hw->link.ops.write_link(hw, hw->link.addr, reg_slice,
+                                                 reg_val);
        }
        return ret_val;
 }
@@ -2808,7 +2961,9 @@ s32 ixgbe_enter_lplu_t_x550em(struct ixgbe_hw *hw)
        bool link_up;
 
        /* SW LPLU not required on later HW revisions. */
-       if (IXGBE_FUSES0_REV1 & IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0)))
+       if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
+           (IXGBE_FUSES0_REV_MASK &
+            IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
                return IXGBE_SUCCESS;
 
        /* If blocked by MNG FW, then don't restart AN */
@@ -3076,6 +3231,59 @@ void ixgbe_release_swfw_sync_X550em(struct ixgbe_hw *hw, u32 mask)
        ixgbe_release_swfw_sync_X540(hw, mask);
 }
 
+/**
+ *  ixgbe_acquire_swfw_sync_X550a - Acquire SWFW semaphore
+ *  @hw: pointer to hardware structure
+ *  @mask: Mask to specify which semaphore to acquire
+ *
+ *  Acquires the SWFW semaphore and get the shared phy token as needed
+ */
+static s32 ixgbe_acquire_swfw_sync_X550a(struct ixgbe_hw *hw, u32 mask)
+{
+       u32 hmask = mask & ~IXGBE_GSSR_TOKEN_SM;
+       int retries = FW_PHY_TOKEN_RETRIES;
+       s32 status = IXGBE_SUCCESS;
+
+       DEBUGFUNC("ixgbe_acquire_swfw_sync_X550a");
+
+       while (--retries) {
+               if (hmask)
+                       status = ixgbe_acquire_swfw_sync_X540(hw, hmask);
+               if (status)
+                       break;
+               if (!(mask & IXGBE_GSSR_TOKEN_SM))
+                       break;
+               status = ixgbe_get_phy_token(hw);
+               if (status != IXGBE_ERR_TOKEN_RETRY)
+                       break;
+               if (hmask)
+                       ixgbe_release_swfw_sync_X540(hw, hmask);
+               msec_delay(FW_PHY_TOKEN_DELAY);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_release_swfw_sync_X550a - Release SWFW semaphore
+ *  @hw: pointer to hardware structure
+ *  @mask: Mask to specify which semaphore to release
+ *
+ *  Releases the SWFW semaphore and puts the shared phy token as needed
+ */
+static void ixgbe_release_swfw_sync_X550a(struct ixgbe_hw *hw, u32 mask)
+{
+       u32 hmask = mask & ~IXGBE_GSSR_TOKEN_SM;
+
+       DEBUGFUNC("ixgbe_release_swfw_sync_X550a");
+
+       if (mask & IXGBE_GSSR_TOKEN_SM)
+               ixgbe_put_phy_token(hw);
+
+       if (hmask)
+               ixgbe_release_swfw_sync_X540(hw, hmask);
+}
+
 /**
  * ixgbe_handle_lasi_ext_t_x550em - Handle external Base T PHY interrupt
  * @hw: pointer to hardware structure