net/ixgbe/base: fix getting PHY type for some x550 devices

[dpdk.git] / drivers / net / ixgbe / base / ixgbe_x550.c

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 28c7ce3..d5dffdf 100644 (file)
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2026,19 +2026,32 @@ STATIC s32 ixgbe_enable_lasi_ext_t_x550em(struct ixgbe_hw *hw)
        status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc);
 
        /* Enable link status change alarm */
-       status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
-                                     IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &reg);
 
-       if (status != IXGBE_SUCCESS)
-               return status;
+       /* Enable the LASI interrupts on X552 devices to receive notifications
+        * of the link configurations of the external PHY and correspondingly
+        * support the configuration of the internal iXFI link, since iXFI does
+        * not support auto-negotiation. This is not required for X553 devices
+        * having KR support, which performs auto-negotiations and which is used
+        * as the internal link to the external PHY. Hence adding a check here
+        * to avoid enabling LASI interrupts for X553 devices.
+        */
+       if (hw->mac.type != ixgbe_mac_X550EM_a) {
+               status = hw->phy.ops.read_reg(hw,
+                                       IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+                                       IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &reg);
 
-       reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
+               if (status != IXGBE_SUCCESS)
+                       return status;
 
-       status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
-                                      IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
+               reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
 
-       if (status != IXGBE_SUCCESS)
-               return status;
+               status = hw->phy.ops.write_reg(hw,
+                                       IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+                                       IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
+
+               if (status != IXGBE_SUCCESS)
+                       return status;
+       }
 
        /* Enable high temperature failure and global fault alarms */
        status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_MASK,
@@ -3040,6 +3053,10 @@ STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
        s32 status;
        u32 reg_val;
 
+       /* iXFI is only supported with X552 */
+       if (mac->type != ixgbe_mac_X550EM_x)
+               return IXGBE_ERR_LINK_SETUP;
+
        /* Disable AN and force speed to 10G Serial. */
        status = mac->ops.read_iosf_sb_reg(hw,
                                        IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
@@ -3136,7 +3153,8 @@ s32 ixgbe_setup_internal_phy_t_x550em(struct ixgbe_hw *hw)
        if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
                return IXGBE_ERR_CONFIG;
 
-       if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+       if (hw->mac.type == ixgbe_mac_X550EM_x &&
+           !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
                /* If link is down, there is no setup necessary so return  */
                status = ixgbe_ext_phy_t_x550em_get_link(hw, &link_up);
                if (status != IXGBE_SUCCESS)
@@ -3779,6 +3797,8 @@ u32 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw)
                if (ext_ability & IXGBE_MDIO_PHY_1000BASET_ABILITY)
                        physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
                break;
+       case ixgbe_phy_m88:
+               physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
        default:
                break;
        }
@@ -4638,8 +4658,10 @@ s32 ixgbe_setup_mac_link_t_X550em(struct ixgbe_hw *hw,
        else
                force_speed = IXGBE_LINK_SPEED_1GB_FULL;
 
-       /* If internal link mode is XFI, then setup XFI internal link. */
-       if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+       /* If X552 and internal link mode is XFI, then setup XFI internal link.
+        */
+       if (hw->mac.type == ixgbe_mac_X550EM_x &&
+           !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
                status = ixgbe_setup_ixfi_x550em(hw, &force_speed);
 
                if (status != IXGBE_SUCCESS)