From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D848CA6011 for ; Thu, 8 Oct 2026 17:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L2jHQ5uSsWE1tJZ2r8Ki7n0PjxWkIoR+7RH2XBS7AsA=; b=xSarjZbHvIjweQgPoLsHuKnmIp Fxo3XlYBGROOWR9+xhFiNUh6eaAgH7dfcyQFeJ0sDvn6g78rKv5HwDhufQ2gbJ7adaKZU9mL6a1O0 cb9RjZ04T6njtrT86eM3Kcwf+I0o7fJdVjczPo2/v7x3Ekf1tlQdqUS6TGQzlzxgCNc40qNRkLi4Q AYEYiss50EYO1zTnf1BqSA519XZkeWA4X6o3/FGepDKtTzUhwqDK4UTbfxvQmrI51LSzAtnSGAanJ 7/dG2sJPunm3Q3LdEKu48hXKlQwVQ4NggPQCLLMrJ/oRfpJr1ABf1OYPogZF0yHKmtY1MAx2ARcSp qXmWkakA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xEsId-00000004odN-0hxM; Thu, 08 Oct 2026 17:52:59 +0000 Received: from mail-pj2-x01.google.com ([2607:f8b0:4864:39::1]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xEsIa-00000004ocD-3NyX for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2026 17:52:58 +0000 Received: by mail-pj2-x01.google.com with SMTP id 98e67ed59e1d1-3a4883304bdso1448715a91.1 for ; Thu, 08 Oct 2026 10:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791481976; x=1792086776; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=L2jHQ5uSsWE1tJZ2r8Ki7n0PjxWkIoR+7RH2XBS7AsA=; b=cLXhzhDFPyvvVSgl6JjFOXgCke5lz/i+qIabE5e0aKYm0zrUpS8/iHo0qiGN5vhDyb 2/y20XDKPsNvfkGQq0KOMf0vsQ0/awfLkOoVHoStFQOx0SvGO7jjRhFkDZ+gKgKYw4C0 i04fN6YhbzjMeQUlN4O5t2lvuml+LIEjSkB6mzRv3sG6qtqg8yp3EO7S2t/0LbqhoEYd vGiuyJoEd42TsxABqppzJyP9vuqX3NGFBW6WShmqjkzQ6Dr86iXFMF9vRZ4wxpC2sxwK GOjnXHC04DTc2HaRNtWh9ueTVlNStHop7GcFks+ndXFtmOZ/Z1tlVOOIbJXhs2eZMJNZ n5Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791481976; x=1792086776; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=L2jHQ5uSsWE1tJZ2r8Ki7n0PjxWkIoR+7RH2XBS7AsA=; b=IMVaJ2VSedWSHN9ypvCaWkyNJp/ql6gWsS98xu2f7NojF3ea7oofEoAz2s45K9z6Ko dMSZ5tc/Jm1kfdG0j7oKEqYsNIyL/owgpzGqC3q6cslZKEmnM/DU67mtJkv7AqKwiZnz pZH77HXSkbgYNe33lqIMZOBSpDBRy6IAX2hJNcjQJ335bMHLCc/AUR+mCxNutX5WUb78 QK6BNxR2wdSB5ULdVPOAuPxw5yLD596Ao6V+O0ILKKHkYMHY2uIh07tkNcXbDQ1nDZnC mKgRCMWpsuUvGcs7sVqLQSQZerEteE1ebQDxr+9YLn3YKOwhYrfnaWi60E+UBZUqMJ5J XRaA== X-Forwarded-Encrypted: i=1; AKwUvBy6hbhezb3v/7SPTq0wzF3Y7nvBYIUXfEWaZN61X79sygCNG8fPC34OKYu/gCrhff1O8UybMOW/gjTygka46IwW@lists.infradead.org X-Gm-Message-State: AFq9FYJmaSilw4L/zLyUflG82ch3IZFQ5PizKiuDhE6Je24lk8bgV7I/ kM5tKbSHLJgY4SpqKFJocZRQOoep4IB1wqgjMBUceKlrZEy03Up23wx/SGz1CFtOz9E0OQ== X-Gm-Gg: AYBFou1GfY90CqTMmJAFcz+kk3Zuehtqbe8qjApJcw6qAiAc6nl++fG4law67e3Lurx KZHTPHasyxY3ka5geZ551Ub+CPiHNTkddzonbb3jZnvvoQTRBdZ4ZEcQz/48SiB75Vs/wKbMXIX hOoroHUvv2aqRc1PHScJ/i4j9I34vhgG5ibqM3rXp1UTPohZEl5++HSp4onMN5x0hHMcw1yrAy2 5x7YR5tIsBOe0H1GMw6lXD3c5kovbPnJbOICaylyk7+NhOUd77RbNI33ELB25J3HQ4Biu/MTn+Z E+G7lrI/DCjIqQ3sS+ka5vTzQDPN5fVXjRup2wRSk0VhHmscpbBzz7F2tNdyX3mMDcxO1bC8Ltx Ly74P2PJdX0k49//hFtB6KJJb/DfVY9MCqEx7FaZHJNMbxVVYjSE5tk+V6OQUktAzaUvVLMQnWa iqMsuiYTEq1ErTP/5sPFli8UujjuVMHUj/KrXFHD1vx5+T1zuXOvOS3Qj2gITNUZE55qSI X-Received: by 2002:a17:90b:28d0:b0:3a8:768d:70e4 with SMTP id 98e67ed59e1d1-3a8a1b59a17mr5454105a91.17.1791481975880; Thu, 08 Oct 2026 10:52:55 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ab3277c459sm144332a91.16.2026.10.08.10.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 10:52:55 -0700 (PDT) From: Coia Prant To: Jakub Kicinski , netdev@vger.kernel.org Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Maxime Chevallier , Maxime Coquelin , Alexandre Torgue , Heiner Kallweit , Russell King , David Wu , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Coia Prant , Jiawen Wu Subject: [PATCH net-next v11 1/6] net: pcs: xpcs: add ANRESTART support for SGMII link recovery Date: Fri, 9 Oct 2026 01:51:55 +0800 Message-ID: <20261008175225.3375274-2-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261008175225.3375274-1-coiaprant@gmail.com> References: <20261008175225.3375274-1-coiaprant@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261008_105256_856917_1A648C5D X-CRM114-Status: GOOD ( 22.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On some hardware using the DesignWare XPCS IP (e.g., RK3568 MAC side SGMII), the PCS does not automatically restart auto-negotiation when the link goes down and comes back up. Without an explicit ANRESTART, the link stays down forever. Add BMCR_ANRESTART in two places: 1. In xpcs_config_aneg_c37_sgmii(), when starting AN, set ANRESTART alongside ANENABLE to initiate a fresh negotiation. 2. In xpcs_get_state_c37_sgmii(), when link is down and AN completion is detected, clear the interrupt and trigger ANRESTART to restart the negotiation process. Propagate the return value of the restart so errors are not silently ignored. The restart cannot go through the .pcs_an_restart op: phylink only calls it for 802.3z interfaces, and SGMII is not one. Changing hardware state from pcs_get_state() is already done elsewhere in this driver (xpcs_get_state_c73() calls xpcs_soft_reset() and xpcs_do_config()), so the same pattern is used here. The latch is cleared before issuing the restart, not after: clearing it afterwards would discard a freshly latched ANCMPLT from the new negotiation. If an MDIO access fails at this point, it indicates an unrecoverable hardware condition until reset. Also clear DW_VR_MII_AN_INTR_STS in xpcs_config_aneg_c37_sgmii() before starting AN, matching what xpcs_config_aneg_c37_1000basex() already does. On the non-inband path the function now returns the result of that write instead of the DIG_CTRL1 modify. Update the comment in xpcs_config_aneg_c37_sgmii() to note that although the DesignWare databook says AN restart is not needed for MAC side SGMII, some implementations (e.g. Rockchip RK3568) require it to recover the link after a disconnect. This is not a fix for an existing mainline platform: the affected platform (RK3568 XPCS) is introduced later in the same series. Tested-by: Jiawen Wu Tested-by: Maxime Chevallier Signed-off-by: Coia Prant --- drivers/net/pcs/pcs-xpcs.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index b415b93d77c15..6466e0ff2a98b 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -761,7 +761,9 @@ static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs, * DW xPCS used with DW EQoS MAC is always MAC side SGMII. * 4) VR_MII_DIG_CTRL1 Bit(9) [MAC_AUTO_SW] = 1b (Automatic * speed/duplex mode change by HW after SGMII AN complete) - * 5) VR_MII_MMD_CTRL Bit(12) [AN_ENABLE] = 1b (Enable SGMII AN) + * 5) VR_MII_AN_INTR_STS = 0x0 (Clear CL37 AN complete status) + * 6) VR_MII_MMD_CTRL Bit(12) [AN_ENABLE] = 1b (Enable SGMII AN) + * VR_MII_MMD_CTRL Bit(9) [AN_RESTART] = 1b (Restart SGMII AN) * * Note that VR_MII_MMD_CTRL is MII_BMCR. * @@ -769,7 +771,14 @@ static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs, * SR_MII_AN_ADV. MAC side SGMII receives AN Tx Config from * PHY about the link state change after C28 AN is completed * between PHY and Link Partner. There is also no need to - * trigger AN restart for MAC-side SGMII. + * trigger AN restart for MAC-side SGMII on most devices. + * + * Note: While the DesignWare databook states that AN restart is + * not needed for MAC side SGMII, some implementations (e.g. + * Rockchip RK3568) exhibit a timing quirk when integrated with + * phylink and do not restart AN automatically when the link + * comes back up. An explicit AN restart is required on those + * parts to recover the link after a disconnect. */ mdio_ctrl = xpcs_read(xpcs, MDIO_MMD_VEND2, MII_BMCR); if (mdio_ctrl < 0) @@ -816,9 +825,14 @@ static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs, if (ret < 0) return ret; + /* Clear CL37 AN complete status */ + ret = xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS, 0); + if (ret < 0) + return ret; + if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) ret = xpcs_write(xpcs, MDIO_MMD_VEND2, MII_BMCR, - mdio_ctrl | BMCR_ANENABLE); + mdio_ctrl | BMCR_ANENABLE | BMCR_ANRESTART); return ret; } @@ -1093,9 +1107,18 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, return 0; } - /* Clear AN complete status or interrupt */ - if (state->an_complete) - xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS, 0); + if (state->an_complete) { + /* Clear AN complete status or interrupt */ + ret = xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS, 0); + if (ret < 0) + return ret; + + /* Initiate the next round of AN */ + ret = xpcs_modify(xpcs, MDIO_MMD_VEND2, MII_BMCR, BMCR_ANRESTART, + BMCR_ANRESTART); + if (ret < 0) + return ret; + } return 0; } -- 2.47.3