lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 62/89] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit a8bf879af7b1999eba36303ce9cc60e0e7dd816c ]

    Add the two 1000BaseLX enum values to the X550's check for 1Gbps modules,
    allowing the core driver code to establish a link over this SFP type.

    This is done by the out-of-tree driver but the fix wasn't in mainline.

    Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+”)
    Fixes: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
    Signed-off-by: Josh Elsasser <jelsasser@appneta.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
    index cf6a245db6d5..a37c951b0753 100644
    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
    @@ -2257,7 +2257,9 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
    *autoneg = false;

    if (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
    - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
    + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 ||
    + hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
    + hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1) {
    *speed = IXGBE_LINK_SPEED_1GB_FULL;
    return 0;
    }
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-14 13:31    [W:7.367 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site