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 57E3CC55173 for ; Sat, 1 Aug 2026 14:24:11 +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=LX6e13BQ6UJAH9yya+bOU5LhJJwhDdd8JlyZZCveOd8=; b=x5Gxadj7UJ0KgvopPMDjhCk2D4 RElmCwcs0++z7qx2GFOVuhqIHw9r0LRWpd47xA+cdDKB3Rn6KElt5wfZdUQAGgYedLmgbdcsWrdyX Fv49sg383yvq1kAL2UeGFt5NF+pyodgU/ojcDvPKcra+6VTYAa4UMjXmr5G1Q06bQhAo1/8n6W6Rq ySJQs89XfR8JiP8rZJRVOPU/o9znI60FAzpGvHTrFhc9oImX/TCpmIffjgh72IaqkVxylvPNASGSU bFy3QjiqFluSNIrx+vYyuqwg3HkL/7dl/M6j2UvIgMY8hqxRA7hYHVd0vqBHNVof6p4Z5LXsfcByl ab7ZRHDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqAd3-0000000Eiqz-2kwo; Sat, 01 Aug 2026 14:23:57 +0000 Received: from mail-pj2-x0a.google.com ([2607:f8b0:4864:39::a]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqAd0-0000000EimL-1SLo for linux-arm-kernel@lists.infradead.org; Sat, 01 Aug 2026 14:23:56 +0000 Received: by mail-pj2-x0a.google.com with SMTP id d9443c01a7336-2cf41b07aceso8571305ad.0 for ; Sat, 01 Aug 2026 07:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785594234; x=1786199034; 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=LX6e13BQ6UJAH9yya+bOU5LhJJwhDdd8JlyZZCveOd8=; b=pV0crPLoNgcJtO+RBIFYYodCpPMjTuDMnvAUSYsvEV5QMN8bkdNNamn1U2enrj+06w qbX8aXZHoq/PxwunHIjk0BYwHO1meQxT4loTHOJ754Wwv4WcstdcwdBfBfyGAH9S6sQU 6YHFn0jed18751thGmLXArgoZgGzWbCeS4esGsCGHvTpKWN8VyJ40rDB1LjDLEIa+S2C ibJMOQ6/wBkxPDtxb9KgCKlYc+QI32oX2PfGR+5Q5h2wjgt0Pwa4M0SClQ9ykF8r+uun MwF/rRL2ho+yiLEeQILAYArycUyqImpv3Y5BNxiPwpiRYSY56nap0fDTKqJNV9G8VXMB RNqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785594234; x=1786199034; 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=LX6e13BQ6UJAH9yya+bOU5LhJJwhDdd8JlyZZCveOd8=; b=hWjArAvbcsnOEpZPvKfLgnumElC0ihgGMNigyjVu0XqvHo+wUAJH5Tb5FfQClRrv0s C6tbMKLx/TEh/haZSNF3llQt0V5vX4/wg5fJbiTXw0dfkCKMErQduo/uBMH3p92jEQRG UhvX0TgXCn0yPJsi0A2anUEUSMeERZeUNzYWr2if+PAjsEOGMDfBIdn1Piy3ZyNb5xok V2iATtJDRax5LP4yVjnGzc9w40BsAVsVet1PuFo23+SpBSyYrRejv9Ju7QM2Sk303SP4 wwhatkTrKt/F5m+a/Ip/o6vcqohx99VF9SqMPDyqEfTOHVgrcJLzRmZaBuGAuxuFnbSR Q8aQ== X-Forwarded-Encrypted: i=1; AHgh+Rq+z04WlmADx+b79orQ0Qt8/xN3B6v/XFKtIMqEnUiKH4xgqh7SNO06utcD39KL1to8ggoS0vsrB5dWvvu627XT@lists.infradead.org X-Gm-Message-State: AOJu0YzeXQ794h4FNRo6MhFIqtG3AfhFptp84xAUndTbNLfy57cAsmgP pTN8v46dY7GB6nWFH+Y7+TEI5IY3Z8IMUKeCdLQs7Bc2A8pLUskNugy4 X-Gm-Gg: AR+sD12mUcXQo7uStPzhmNKpGueM5GvHKH3ZGa69X7KCcpirsZGjag82s/dh13V4apj ss3E1QMcp2mDqy93/K5FCMPzGaHME+AUGbYPkZjZXuvTwWNBcsuDynE0BoI3xfAIym465fxny4U rBvhSJtM/ehUqinb4eeqGdVmiz44Np8PnpWFT5ByzzAUw24N4siFgGcgdXUZjHOEUGqkfD5YyMQ Q7UhjmxAB4T+nn4o/Iv4hKobP8yoxby/aSk/2GyLvlyFapGxlydJJiZpGcSpZ0GPlaFOgqTuXwX cG6A90uslI26y6S6ftjn3ZXW3AaGTcMoPbDKXdcXVIZHzH+JVCeyEFcl9L4h1pk5QRcJrKuSZeK eFS+6lrWYbegkcEXW/AFaqvg8SZQ6wPY0/EMv+ItaxMJ2G5CYUc2HyvfIEWAE1QFNTt28hzXvUA LCbrUeS/moPb+b1JcUiPP75H2qWqOyW7Y4LpnagNc18Wl741T59Q6E4yU= X-Received: by 2002:a17:903:2f4d:b0:2c9:97a8:8c19 with SMTP id d9443c01a7336-2d052474babmr36307755ad.44.1785594233641; Sat, 01 Aug 2026 07:23:53 -0700 (PDT) Received: from server.lan ([103.213.4.16]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d04ae5ac3dsm18043845ad.23.2026.08.01.07.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2026 07:23:53 -0700 (PDT) From: Coia Prant To: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Vinod Koul , Maxime Chevallier , Maxime Coquelin , Alexandre Torgue , Lad Prabhakar , Romain Gantois , Heiner Kallweit , Coia Prant Cc: Neil Armstrong , Russell King , Shawn Lin , David Heidelberg , netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-renesas-soc@vger.kernel.org, Jiawen Wu Subject: [PATCH v2 06/10] net: pcs: xpcs: add ANRESTART support for SGMII link recovery Date: Sat, 1 Aug 2026 22:22:30 +0800 Message-ID: <20260801142244.679437-8-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260801142244.679437-2-coiaprant@gmail.com> References: <20260801142244.679437-2-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-20260801_072354_408388_19081EEC X-CRM114-Status: GOOD ( 17.74 ) 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. This change has been verified on: - RK3568 (Photonicat board) - Wangxun NICs (no regression) Tested-by: Jiawen Wu Signed-off-by: Coia Prant --- drivers/net/pcs/pcs-xpcs.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 0337e2bcc0125..28e98449e8ac2 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -816,9 +816,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; } @@ -1089,14 +1094,18 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, state->duplex = DUPLEX_FULL; else state->duplex = DUPLEX_HALF; - return 0; } - /* Clear AN complete status or interrupt */ - if (state->an_complete) + if (state->an_complete) { + /* Clear AN complete status or interrupt */ xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS, 0); + /* Initiate the next round of AN */ + xpcs_modify(xpcs, MDIO_MMD_VEND2, MII_BMCR, BMCR_ANRESTART, + BMCR_ANRESTART); + } + return 0; } -- 2.47.3