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: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
Signed-off-by: Josh Elsasser <[email protected]>
---
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 10dbaf4f6e80..9c42f741ed5e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2262,7 +2262,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
Josh Elsasser <[email protected]> writes:
> Fixes: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
Not that it matters much I guess, but I think LX SFPs were unsupported
at that time. The LX support appears to have been added under the radar
while refactoring ixgbe_setup_sfp_modules_X550em in commit e23f33367882
("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+")
Bjørn
Bjørn Mork <[email protected]> wrote:
> Not that it matters much I guess, but I think LX SFPs were unsupported
> at that time. The LX support appears to have been added under the radar
> while refactoring ixgbe_setup_sfp_modules_X550em in commit e23f33367882
> ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+")
Looks like you’re right. Want me to respin with an additional “Fixes” tag?
- Josh
> -----Original Message-----
> From: Intel-wired-lan [mailto:[email protected]] On
> Behalf Of Josh Elsasser
> Sent: Saturday, November 24, 2018 12:58 PM
> To: [email protected]
> Cc: [email protected]; David S. Miller <[email protected]>; Josh
> Elsasser <[email protected]>; [email protected]
> Subject: [Intel-wired-lan] [PATCH net] ixgbe: recognize 1000BaseLX SFP
> modules as 1Gbps
>
> 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: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
> Signed-off-by: Josh Elsasser <[email protected]>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Tested-by: Andrew Bowers <[email protected]>
On Mon, 2018-11-26 at 09:54 -0800, Josh Elsasser wrote:
> Bjørn Mork <[email protected]> wrote:
>
> > Not that it matters much I guess, but I think LX SFPs were
> > unsupported
> > at that time. The LX support appears to have been added under the
> > radar
> > while refactoring ixgbe_setup_sfp_modules_X550em in commit
> > e23f33367882
> > ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+")
>
> Looks like you’re right. Want me to respin with an additional “Fixes”
> tag?
No need to re-spin the patch, just reply with the additional "Fixes"
tag and if patchwork does not pick it up, I will add it to the patch I
have in my tree for validation and review.
Jeff Kirsher <[email protected]> wrote:
> No need to re-spin the patch, just reply with the additional "Fixes"
> tag and if patchwork does not pick it up, I will add it to the patch I
> have in my tree for validation and review.
Thanks, let’s try that.
Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+”)
From: Josh Elsasser <[email protected]>
Date: Mon, 26 Nov 2018 16:54:11 -0800
> Jeff Kirsher <[email protected]> wrote:
>
>> No need to re-spin the patch, just reply with the additional "Fixes"
>> tag and if patchwork does not pick it up, I will add it to the patch I
>> have in my tree for validation and review.
>
> Thanks, let$B!G(Bs try that.
>
> Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+$B!I(B)
Unfortunately, patchwork isn't smart enough to pick up Fixes: tags
still.
On 11/26/2018 8:52 PM, David Miller wrote:
> From: Josh Elsasser <[email protected]>
> Date: Mon, 26 Nov 2018 16:54:11 -0800
>
>> Jeff Kirsher <[email protected]> wrote:
>>
>>> No need to re-spin the patch, just reply with the additional "Fixes"
>>> tag and if patchwork does not pick it up, I will add it to the patch I
>>> have in my tree for validation and review.
>>
>> Thanks, let$B!G(Bs try that.
>>
>> Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+$B!I(B)
>
> Unfortunately, patchwork isn't smart enough to pick up Fixes: tags
> still.
>
This is something that can be added easily in the patchwork
administration panel, maybe ask Jeremy or Stephen to do that?
--
Florian
On Mon, 2018-11-26 at 20:52 -0800, David Miller wrote:
> From: Josh Elsasser <[email protected]>
> Date: Mon, 26 Nov 2018 16:54:11 -0800
>
> > Jeff Kirsher <[email protected]> wrote:
> >
> > > No need to re-spin the patch, just reply with the additional
> > > "Fixes"
> > > tag and if patchwork does not pick it up, I will add it to the
> > > patch I
> > > have in my tree for validation and review.
> >
> > Thanks, let’s try that.
> >
> > Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for
> > X550EM_x SFP+”)
>
> Unfortunately, patchwork isn't smart enough to pick up Fixes: tags
> still.
:-( I will get it added to the patch in my tree then. Thanks Dave for
the info.