ixgbe: Manual AN-37 for troublesome link partners for X550 SFI
Subsystems (3)
PATCH 1/1 ixgbe: Manual AN-37 for troublesome link partners for X550 SFI
Some (Juniper MX5) SFP link partners exhibit a disinclination to autonegotiate with X550 configured in SFI mode. This patch enables a manual AN-37 restart to work around the problem.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +3 -0
@@ -3705,7 +3705,9 @@ struct ixgbe_info {#define IXGBE_KRM_LINK_S1 (P ) ((P) ? 0x8200 : 0x4200)#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P) ? 0x820C : 0x420C)#define IXGBE_KRM_AN_CNTL_1 (P ) ((P) ? 0x822C : 0x422C) +#define IXGBE_KRM_AN_CNTL_4 (P ) ((P) ? 0x8238 : 0x4238)#define IXGBE_KRM_AN_CNTL_8 (P ) ((P) ? 0x8248 : 0x4248) +#define IXGBE_KRM_PCS_KX_AN (P ) ((P) ? 0x9918 : 0x5918)#define IXGBE_KRM_SGMII_CTRL (P ) ((P) ? 0x82A0 : 0x42A0)#define IXGBE_KRM_LP_BASE_PAGE_HIGH (P ) ((P) ? 0x836C : 0x436C)#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P) ? 0x8634 : 0x4634)
@@ -3715,6 +3717,7 @@ struct ixgbe_info {#define IXGBE_KRM_PMD_FLX_MASK_ST20 (P ) ((P) ? 0x9054 : 0x5054)#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P) ? 0x9520 : 0x5520)#define IXGBE_KRM_RX_ANA_CTL (P ) ((P) ? 0x9A00 : 0x5A00) +#define IXGBE_KRM_FLX_TMRS_CTRL_ST31 (P ) ((P) ? 0x9180 : 0x5180)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA ~(0x3 << 20)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR BIT(20)
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +50 -0
56 lines not on this page · raw message
Signature · 1 line
2.25.1
Tony Nguyen
maintainerQuoted 3 lines · Jeff Daly
Some (Juniper MX5) SFP link partners exhibit a disinclination to autonegotiate with X550 configured in SFI mode. This patch enables a manual AN-37 restart to work around the problem.
Hi Jeff,
I talked to the ixgbe team about this and we need a bit more time to look this over. Will keep you updated.
Quoted 35 lines
Signed-off-by Jeff Daly <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+)drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +3
-0@@ -3705,7 +3705,9 @@ struct ixgbe_info {#define IXGBE_KRM_LINK_S1 (P ) ((P) ? 0x8200 : 0x4200)#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P) ? 0x820C : 0x420C)#define IXGBE_KRM_AN_CNTL_1 (P ) ((P) ? 0x822C : 0x422C) +#define IXGBE_KRM_AN_CNTL_4 (P ) ((P) ? 0x8238 : 0x4238)#define IXGBE_KRM_AN_CNTL_8 (P ) ((P) ? 0x8248 : 0x4248) +#define IXGBE_KRM_PCS_KX_AN (P ) ((P) ? 0x9918 : 0x5918)#define IXGBE_KRM_SGMII_CTRL (P ) ((P) ? 0x82A0 : 0x42A0)#define IXGBE_KRM_LP_BASE_PAGE_HIGH (P ) ((P) ? 0x836C : 0x436C)#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P) ? 0x8634 : 0x4634)@@ -3715,6 +3717,7 @@ struct ixgbe_info {#define IXGBE_KRM_PMD_FLX_MASK_ST20 (P ) ((P) ? 0x9054 : 0x5054)#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P) ? 0x9520 : 0x5520)#define IXGBE_KRM_RX_ANA_CTL (P ) ((P) ? 0x9A00 : 0x5A00) +#define IXGBE_KRM_FLX_TMRS_CTRL_ST31 (P ) ((P) ? 0x9180 : 0x5180)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA ~(0x3 << 20)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR BIT(20)drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +0
-0@@ -1725,6 +1725,56 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)IXGBE_KRM_PMD_FLX_MASK_ST20 (hw->bus.lan_id), IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed) · line 1736
Quoted 10 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +9
-0+/* change mode enforcement rules to hybrid */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_FLX_TMRS_CTRL_ST31 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x0400 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_FLX_TMRS_CTRL_ST31 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val);
I don't see a need for all the status assignments, they're not being used before being overwritten.
Thanks,
Tony
Quoted 43 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +40
-0+/* manually control the config */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x20002240 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* move the AN base page values */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_PCS_KX_AN (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x1 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_PCS_KX_AN (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* set the AN37 over CB mode */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_AN_CNTL_4 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x20000000 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_AN_CNTL_4 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* restart AN manually */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); +/* Toggle port SW reset by AN reset. */ status =ixgbe_restart_an_internal_phy_x550em (hw);
Tony Nguyen
maintainerQuoted 10 lines · Tony Nguyen
Quoted 3 lines · Jeff Daly
Some (Juniper MX5) SFP link partners exhibit a disinclination to autonegotiate with X550 configured in SFI mode.? This patch enables a manual AN-37 restart to work around the problem.
Hi Jeff,
I talked to the ixgbe team about this and we need a bit more time to look this over. Will keep you updated.
Hi Jeff,
Our developer is having some issues responding to this but this patch look ok. However, can you please address the unneeded status assignments. Also, replace the magic numbers for the register writes with meaningful define names.
Thanks,
Tony
Quoted 101 lines
Quoted 37 lines
Signed-off-by Jeff Daly <[email protected]>---
?drivers/net/ethernet/intel/ixgbe/ixgbe_type.h|? 3 ++
?drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c| 50 +++++++++++++++++++ ? 2 files changed, 53 insertions(+)drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +3
-0@@ -3705,7 +3705,9 @@ struct ixgbe_info { ? #define IXGBE_KRM_LINK_S1(P)??????? ((P) ? 0x8200 : 0x4200) ? #define IXGBE_KRM_LINK_CTRL_1(P)??? ((P) ? 0x820C : 0x420C) ? #define IXGBE_KRM_AN_CNTL_1(P)??????? ((P) ? 0x822C : 0x422C) +#define IXGBE_KRM_AN_CNTL_4 (P )??????? ((P) ? 0x8238 : 0x4238) ? #define IXGBE_KRM_AN_CNTL_8(P)??????? ((P) ? 0x8248 : 0x4248) +#define IXGBE_KRM_PCS_KX_AN (P )??????? ((P) ? 0x9918 : 0x5918) ? #define IXGBE_KRM_SGMII_CTRL(P)??????? ((P) ? 0x82A0 : 0x42A0) ? #define IXGBE_KRM_LP_BASE_PAGE_HIGH(P)??? ((P) ? 0x836C : 0x436C) ? #define IXGBE_KRM_DSP_TXFFE_STATE_4(P)??? ((P) ? 0x8634 : 0x4634)@@ -3715,6 +3717,7 @@ struct ixgbe_info { ? #define IXGBE_KRM_PMD_FLX_MASK_ST20(P)??? ((P) ? 0x9054 : 0x5054) ? #define IXGBE_KRM_TX_COEFF_CTRL_1(P)??? ((P) ? 0x9520 : 0x5520) ? #define IXGBE_KRM_RX_ANA_CTL(P)??????? ((P) ? 0x9A00 : 0x5A00) +#define IXGBE_KRM_FLX_TMRS_CTRL_ST31 (P )??? ((P) ? 0x9180 : 0x5180) ? #define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA??????? ~(0x3 << 20) ? #define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR??????? BIT(20)drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +0
-0@@ -1725,6 +1725,56 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed) ????????????????? IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c static s32 ixgbe_setup_sfi_x550a(struct · line 1736
Quoted 10 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +9
-0????????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); +??? /* change mode enforcement rules to hybrid */ +??? status = mac->ops.read_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_FLX_TMRS_CTRL_ST31(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); +??? reg_val |= 0x0400; + +??? status = mac->ops.write_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_FLX_TMRS_CTRL_ST31(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);I don't see a need for all the status assignments, they're not being used before being overwritten.
Thanks,
Tony
Quoted 40 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +40
-0+??? /* manually control the config */ +??? status = mac->ops.read_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); +??? reg_val |= 0x20002240; + +??? status = mac->ops.write_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); + +??? /* move the AN base page values */ +??? status = mac->ops.read_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); +??? reg_val |= 0x1; + +??? status = mac->ops.write_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_PCS_KX_AN(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); + +??? /* set the AN37 over CB mode */ +??? status = mac->ops.read_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); +??? reg_val |= 0x20000000; + +??? status = mac->ops.write_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_AN_CNTL_4(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); + +??? /* restart AN manually */ +??? status = mac->ops.read_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); +??? reg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART; + +??? status = mac->ops.write_iosf_sb_reg(hw, +??????????????? IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id), +??????????????? IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); +Quoted 2 lines
????? /* Toggle port SW reset by AN reset. */ ????? status =
ixgbe_restart_an_internal_phy_x550em(hw);_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
I can't replace the hardcoded values with meaningful assignments because I don't know what the bit names are. This was originally a patch that Intel worked on for Silicom. I suspect they are all DFT bits and as such are probably not going to be disclosed.
Quoted 29 lines
-----Original Message-----
From: Tony Nguyen <[email protected]>
Sent: Thursday, May 12, 2022 1:09 PM
To: Jeff Daly <[email protected]>; [email protected]; Skajewski, PiotrX <[email protected]>
Cc: Jakub Kicinski <[email protected]>; open list:NETWORKING DRIVERS <[email protected]>; open list <[email protected]>; David S. Miller <[email protected]>
Subject: Re: [Intel-wired-lan] [PATCH] ixgbe: Manual AN-37 for troublesome link partners for X550 SFICaution: This is an external email. Please take care when clicking links or opening attachments.
Quoted 10 lines · Tony Nguyen
Quoted 3 lines · Jeff Daly
Some (Juniper MX5) SFP link partners exhibit a disinclination to autonegotiate with X550 configured in SFI mode. This patch enables a manual AN-37 restart to work around the problem.
Hi Jeff,
I talked to the ixgbe team about this and we need a bit more time to look this over. Will keep you updated.
Hi Jeff,
Quoted 109 lines
Our developer is having some issues responding to this but this patch look ok. However, can you please address the unneeded status assignments. Also, replace the magic numbers for the register writes with meaningful define names.
Thanks,
TonyQuoted 101 lines
Quoted 37 lines
Signed-off-by Jeff Daly <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+)drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +3
-0@@ -3705,7 +3705,9 @@ struct ixgbe_info {#define IXGBE_KRM_LINK_S1 (P ) ((P) ? 0x8200 : 0x4200)#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P) ? 0x820C : 0x420C)#define IXGBE_KRM_AN_CNTL_1 (P ) ((P) ? 0x822C : 0x422C) +#define IXGBE_KRM_AN_CNTL_4 (P ) ((P) ? 0x8238 : 0x4238)#define IXGBE_KRM_AN_CNTL_8 (P ) ((P) ? 0x8248 : 0x4248) +#define IXGBE_KRM_PCS_KX_AN (P ) ((P) ? 0x9918 : 0x5918)#define IXGBE_KRM_SGMII_CTRL (P ) ((P) ? 0x82A0 : 0x42A0)#define IXGBE_KRM_LP_BASE_PAGE_HIGH (P ) ((P) ? 0x836C : 0x436C)#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P) ? 0x8634 : 0x4634)@@ -3715,6 +3717,7 @@ struct ixgbe_info {#define IXGBE_KRM_PMD_FLX_MASK_ST20 (P ) ((P) ? 0x9054 : 0x5054)#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P) ? 0x9520 : 0x5520)#define IXGBE_KRM_RX_ANA_CTL (P ) ((P) ? 0x9A00 : 0x5A00) +#define IXGBE_KRM_FLX_TMRS_CTRL_ST31 (P ) ((P) ? 0x9180 : 0x5180)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA ~(0x3 << 20)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR BIT(20)drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +0
-0@@ -1725,6 +1725,56 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed) IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c static s32 ixgbe_setup_sfi_x550a(struct · line 1736
Quoted 10 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +9
-0IXGBE_SB_IOSF_TARGET_KR_PHY, reg_val); +/* change mode enforcement rules to hybrid */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_FLX_TMRS_CTRL_ST31 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x0400 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_FLX_TMRS_CTRL_ST31 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val);I don't see a need for all the status assignments, they're not being used before being overwritten.
Thanks,
Tony
Quoted 32 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +32
-0+/* manually control the config */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x20002240 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* move the AN base page values */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_PCS_KX_AN (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x1 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_PCS_KX_AN (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* set the AN37 over CB mode */ + status = mac->ops.read_iosf_sb_reg (hw, +IXGBE_KRM_AN_CNTL_4 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , ®_val); + reg_val |=0x20000000 ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_AN_CNTL_4 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); + +/* restart AN manually */ + status = mac->ops.read_iosf_sb_reg(hw,drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed) · line 1779
Quoted 10 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +8
-0+IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), + IXGBE_SB_IOSF_TARGET_KR_PHY, ®_val); + reg_val |=IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART ; + + status = mac->ops.write_iosf_sb_reg (hw, +IXGBE_KRM_LINK_CTRL_1 (hw->bus.lan_id), +IXGBE_SB_IOSF_TARGET_KR_PHY , reg_val); +/* Toggle port SW reset by AN reset. */ status =ixgbe_restart_an_internal_phy_x550em (hw);_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Tony Nguyen
maintainerQuoted 1 line · Jeff Daly
I can't replace the hardcoded values with meaningful assignments because I don't know what the bit names are. This was originally a patch that Intel worked on for Silicom. I suspect they are all DFT bits and as such are probably not going to be disclosed.
Could you re-send the patch? It's many pages back now and, likely, easier if you could re-send it.
Thanks,
Tony
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 1/1 ixgbe: Manual AN-37 for troublesome link partners for X550 SFI
In reply to Jeff DalyHi Jeff,
This patch has been tested by validation team and appears to be working correctly. ACK, but first take a stance on the comment form Tony
Piotr