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 A51E4CA5FF5 for ; Mon, 5 Oct 2026 22:31: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=qV27EqO7kHeBE+y0OH+VmGtp1o txzrHYDhVB2Ft2PpvkuydLKdq2JnRP6CTb+NgoKzi4H0rmXnekX+1IopG8eI9iSUvOrhojud6q9yi eBiHa6Qt+o8h7maHbdGvhciCD4F8uYCFwGLjbQcwYM1HKnyrITrc/eZa6HaxjyMknCWag/G3TweGN qA5vnbC2l8R9AnLyBvfm6jX2GHmjGlPtxfH+Y4N9955K5ZnLDf4FN8nxUkGNSJAwiGwcq9kYGpVvf W76jnmSzQkfLgKdTXUHNnuNzQHZwcWJDxq30KqiaMbZfM4jIi+abyXQKcCjiiOuAZgvPzMO3KwYtE v6b913xA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDrCs-0000000HG9s-1Jjp; Mon, 05 Oct 2026 22:30:50 +0000 Received: from mail-pj2-x08.google.com ([2607:f8b0:4864:39::8]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDrCp-0000000HG8L-3hP9 for linux-arm-kernel@lists.infradead.org; Mon, 05 Oct 2026 22:30:49 +0000 Received: by mail-pj2-x08.google.com with SMTP id d9443c01a7336-2e2f14b1521so14457965ad.1 for ; Mon, 05 Oct 2026 15:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791239447; x=1791844247; 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=CJX0yVW3pjzqKU41CcSyzrIWt2kyY1zFTlCTpq2IngC8rWz2YPZcFPGMXf1E6woyRU ZulE0Eh8cLkpmnQIhyINw/Tk9n332Om7RwvYBL8Ej3pqIvBSsKmpLucpuWl25J1nqBQq Vg9jHVHzqj9GT7Fbc0OijinZcrarOu6PRlsY7ruApVmKUaAtS1V1W9Gy8H09KW+Kj8Y6 WPZ4NTRGqvVqR4N133KzXN+jbWMOYOpZ13N0kIcJrxgmttd6G7eDI8C2Gvila2Msa5PM rkMSmayn0Lg9tSS/y3X4J9kMiEZ6BEXT/cGRIDdoHwJQ270+4Tx5Md5EgY5jWYRiN6CK kYQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791239447; x=1791844247; 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=fewMkzad2cbgt/5bJuFXaPj0YUW6yOEeXBgqHwq/3mhanX+MpHkVqtvs49PlcrV2Xa 4B/Yurl7tlSw3hbyXX5X5Wv+9aQ+Hs/3tmJNWGPV3LU/nufzpivsfdLKqkZ/R2KY3rda FFNQF6L6b/EAOIJfZmXJEuLzXsyivjQL+qAV7vIffY3nDLVeURl0VFRVYoxV/UHkKmjC bYaApq2JuWZ+SmFzdIAeDhPFbSqPigyUjSEXbUOqJbnMQv0d/0VJCX1SOqEAEFFvQQsU m4z+72k8TVcOaHsA4Ttt+yP3Uf7oNG9rLdfm6z5ONI2xcTmgRny8tOKTyp6vtDOdkGJ7 /gwA== X-Forwarded-Encrypted: i=1; AKwUvBwLNt/kvpAFYId0d+peXFucl25KTJkNbpVb6kecTOJrB89sIidNX9ZyaSfbfeooWaxXG4SJhOC83pCB+3aREFRF@lists.infradead.org X-Gm-Message-State: AFq9FYKPTq5Qd/UDmTD+gOTzWAg8V1P5EEBPnC/ZAxmmiixwHs97p4GR ox2Q4kCu9DTrBaGr/asphBBgHWN6jbWuvvcmmeci+kRZQ9VdWrtN3X78 X-Gm-Gg: AYBFou30C1vIkJmXrR+Yb7W32F5XdjvGCwxZuh2dthVo0bluvTO0T8W6y8wlL/L/NeA 7FhEO+r/T8fG5yJP8rX01stn07JNYyUyT5HROp6SsHkhi5l1Z56POV5tjdh05d/0P1Z0WGHAuF3 slJCPaj4rKymosjk1QgBHKlzCIi3pWVB658xiZ/7C3gA+sk8nfgHcC2mRFxQAuQ+CLhdpDj0xvT 2zUtWzbUX97gojRFrDTMij4B0mWeoge2aE/4mtJgfRPbPmYOUfx8cEHNXekDrtMiaYCHmy2kh7e wkzLh+GR6Fk13fQngYI5TlvRfhCuouXqPe3I8fkZdhaeGsDt7+AqNuc+LKqevK5Rf5w+DNkHVJD d4nUYOsU+pL7FnDaD5nl82DM70oWUJz+SkWTPDNKFokc+z7ubwSWlPI4dJuVl1EGTjB02KTNKLr gJIGE9V+pHXzG57P1FxZRgQQYgB8SBq1Iw+0+eR5JcHkMO/anUhGZ/uw5/ADJSfr5CuVtI X-Received: by 2002:a17:903:3846:b0:2df:9a29:aeb2 with SMTP id d9443c01a7336-2e4ea0e485bmr89825175ad.3.1791239447197; Mon, 05 Oct 2026 15:30:47 -0700 (PDT) Received: from server.lan ([168.138.199.194]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2e5a5f05321sm13203705ad.78.2026.10.05.15.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 15:30:46 -0700 (PDT) From: Coia Prant To: Jakub Kicinski Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Maxime Chevallier , Heiner Kallweit , Russell King , David Wu , netdev@vger.kernel.org, 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 v10 2/6] net: pcs: xpcs: add ANRESTART support for SGMII link recovery Date: Tue, 6 Oct 2026 06:30:04 +0800 Message-ID: <20261005223011.1124347-3-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261005223011.1124347-1-coiaprant@gmail.com> References: <20261005223011.1124347-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-20261005_153047_931279_B130B639 X-CRM114-Status: GOOD ( 22.29 ) 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