Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Jeff Daly <jeffd@silicom-usa.com>
To:     intel-wired-lan@lists.osuosl.org
Cc:     Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        netdev@vger.kernel.org (open list:NETWORKING DRIVERS),
        linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] ixgbe: Manual AN-37 for troublesome link partners for X550 SFI
Date:   Wed, 16 Mar 2022 15:27:10 -0400
Message-Id: <20220316192710.9947-1-jeffd@silicom-usa.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BPNHJynC66/jIAKg1npmustlVHD8H1HLzKrnnPd6oksaHa8jQg0T4x+8g8i3?=
 =?us-ascii?Q?I6Zbmz52YtN42dN9cCoOdKdjaWHTNtUyPHhsfzw2itqS7Bxnchrp0yx+Pqw6?=
 =?us-ascii?Q?b3zz2a48pP00NubC4QH7k/ShsYTA+UzEBxmSfe2+NlgEvy3KweXFI2GzQaU3?=
 =?us-ascii?Q?23bcZKQc85anYAx/UT7pm9z35gilHkK+QuwRxPxw32C1fHL2Px0+NWZqr4XP?=
 =?us-ascii?Q?+spiDlZ62167E0Bdbho/3qhLmqTtKV1EJ8NOmLew5u1s7QKIdpFz/C7ZL24X?=
 =?us-ascii?Q?VmWku0xT1TMF1ZaWgja7nhnS1oj0wj5lNrp4/YU90E13srJVL0vPDNaLt0Z2?=
 =?us-ascii?Q?9ljgRjXxTJ0zDknCOtliJn0lpBCSnEeC6lkMIWsCVSVIEX+9ZsbdxCzvmBn5?=
 =?us-ascii?Q?7a+cZv1S/MBxLYsfaEHata5T+J9W/Lyt6DZ068GwSHBLFTuTGCC6GsSvwX4I?=
 =?us-ascii?Q?pW5+2JqwyrnmkzkqWTow3eeVa9WOZg41J7T1/AM2jqv3LInyCrNVXjR1QJUu?=
 =?us-ascii?Q?yDqjscplrAuJ3omb7oBLRIMdC/BmpSn5ZAAN7OtcpCSuVf8YwDXX2Rp8fYwg?=
 =?us-ascii?Q?YTWm3+rsI8IkPcSJB6NBm6wV/CoXFqkqbgdf8/o99QniyZjCvBS+adBzvKQF?=
 =?us-ascii?Q?v0S6uc2it3YTlIZOmbZhPr00Tq4xL+bKIX8/eBj4A+p4vyNAs6KHlgThGlip?=
 =?us-ascii?Q?V2So1t3eOK4n9pJ7oFEuuoLvWj/dYngCXeHjaQ914UuwhcGoP0fwvX8h63l1?=
 =?us-ascii?Q?bMFu0n2OtP3xf0yEwxQBz/OJYaOjuE3fgxcYu2OUWKZ1arZLVY80xTM0wC5z?=
 =?us-ascii?Q?7ODE3ahNRZs4NQVKIZYM7RwTfoyGviug6ojlpvcOgLgslE9zng56GpHl2gPy?=
 =?us-ascii?Q?oQpAgrJQSSJfA4oJwpJB/rtg+dYjFcJAXQIuE0r7JiMdqjAAc3atMnRR/SqR?=
 =?us-ascii?Q?zmvC5Q4isvYz0MLPpQ7UjIyF2k15E9Sldd2BdQbj+m3uK9ykIxLNdKVJXL7y?=
 =?us-ascii?Q?/XYHuSmSt3/sC5roW26A7I6ec6JfeJGW/RzvhjaM4Z/+Shc7U7sPcE3KvIhm?=
 =?us-ascii?Q?dxTjgktUYTfXQ0rExfEHfx1LzbIhQs0a9YK2cebyVD87vTCrTDod6KP3Rbxn?=
 =?us-ascii?Q?kV4j3gbVF7RCDrNZH/6Kp72Wq49Gmxk/9Ty0+Gui41SBHDDqcJjc2AcpjWXe?=
 =?us-ascii?Q?1pkh8ANhhOd2e7XZ5yh7djKbxLL7TNVffDpY7BeXJdBNDqBmMowl+NuV46JA?=
 =?us-ascii?Q?4b3q1Rl2aCmjZIXPyQmny31SAXrlK1FJQ4eEnlFe5+sKRK+cbkdv1bPz6zdU?=
 =?us-ascii?Q?5rtGfppo/P8hWRxckFyaIwjklrsnZjuQl5df3WkNae6xZFw9Dlqb7uMup3IV?=
 =?us-ascii?Q?t6HxajLXwldB8u4cyLbaCtNGy3cwiHkDryuJBTksJmSIQAONIkKUUk0lvJiY?=
 =?us-ascii?Q?tC4z0f47Oree6S8IHSsZ6fb7jeYWhOsy?=
X-OriginatorOrg: silicom-usa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a7bf175-ef67-43f0-1c0a-08da0782ffee
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3517.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2022 19:27:24.9315
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: c9e326d8-ce47-4930-8612-cc99d3c87ad1
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: V7LjiOHeaykKXKs/pb2AqTFSEYo9/otJosMHf/iLvowUrMCUqk4GsRB83FOKnAQCkrAdHBwLEYF95mZtZhLT3Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7787
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

Signed-off-by: Jeff Daly <jeffd@silicom-usa.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h |  3 ++
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 50 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 2647937f7f4d..dc8a259fda5f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -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)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index e4b50c7781ff..f48a422ae83f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -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);
 
+	/* 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, &reg_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);
+
+	/* 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, &reg_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, &reg_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, &reg_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, &reg_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);
 
-- 
2.25.1