ixgbe/base: support X550em_x V2 device

Only x550em_x V1 was supported before. Now V2 is supported.
A mask for V1 and V2 is defined and used to support both.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>

diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst
index 9112a56..c097bb8 100644 (file)
--- a/doc/guides/rel_notes/release_16_04.rst
+++ b/doc/guides/rel_notes/release_16_04.rst
@@ -100,6 +100,11 @@ This section should contain new features added in this release. Sample format:
   Added new X550EM_a devices and their mac types, X550EM_a and X550EM_a_vf.
   Updated the code to use the new devices and mac types.
 
+* **Added x550em_x V2 device support.**
+
+  Only x550em_x V1 was supported before. Now V2 is supported.
+  A mask for V1 and V2 is defined and used to support both.
+
 * **Enabled PCI extended tag for i40e.**
 
   It enabled extended tag by checking and writing corresponding PCI config

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index 1285cfd..9c2a89a 100644 (file)
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -4044,7 +4044,7 @@ struct ixgbe_hw {
 
 #define IXGBE_FUSES0_GROUP(_i)         (0x11158 + ((_i) * 4))
 #define IXGBE_FUSES0_300MHZ            (1 << 5)
-#define IXGBE_FUSES0_REV1              (1 << 6)
+#define IXGBE_FUSES0_REV_MASK          (3 << 6)
 
 #define IXGBE_KRM_PORT_CAR_GEN_CTRL(P) ((P) ? 0x8010 : 0x4010)
 #define IXGBE_KRM_LINK_CTRL_1(P)       ((P) ? 0x820C : 0x420C)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 1571b14..456b029 100644 (file)
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -658,7 +658,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 +678,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,
@@ -1602,9 +1602,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;
@@ -2808,7 +2809,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 */