From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f3.google.com (mail-pj2-f3.google.com [74.125.227.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4EEF36B91E for ; Sat, 1 Aug 2026 14:23:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785594242; cv=none; b=tevxRMMVH3oI9xnJYmuIhdldBoSNlxDRkPmb5tzX1S/HHlmwbiQNg6RLReWQbBGWtA+SdgprMscACLbiGSru7ctYbfi8vpRl15i26vqqK0BZObHdo+LEhgk1B/RscfH9E7sN1OfbNc+lM6TkJWSBtDVRYY+eL6kkBJCgMfyVG0o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785594242; c=relaxed/simple; bh=MByt4Br9AvoMjfrWMM7sUzmYzlA9pH4QiEgDjx0OHTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hJ8HN+iOopgqvIs8PWRZ1X0wzLNsRgvnTrcoxoSwuSSe6NmAoewEtpc8qhdeq7M49SrQ8OoWQJx9m9tFlhbQJeMGlZhZCfhQzSq5gl4TS1sXLitk4u89p/e3zZOwHSKVBBd9IObOQkmW9V85P26Kd+jTU+dT/2PnJPtj+pSljAc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=l84TtRlP; arc=none smtp.client-ip=74.125.227.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l84TtRlP" Received: by mail-pj2-f3.google.com with SMTP id d9443c01a7336-2ccbff2e6a7so9632195ad.1 for ; Sat, 01 Aug 2026 07:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785594234; x=1786199034; darn=vger.kernel.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=l84TtRlPVmN/7xCVhawM1RhgDmgo7/3Zppu2jFfDcqeyarAxabmuqEU2CizloS5SoC a4gWMhfA4BtiA+BUV9I0cpuWq8qf4y1xnm/ZoPAl5Pd45dIim3eeqUk3Hq/DfIbK38SW 20pmAFsH6ZJ6sherOw0W91d18+aDXjXK968nWE8moYF460xj8AjmiSFWSOBZtOOUC9sq 2cNZSbHowUs0+twFH4c2tDrdDEvgowI9fMmoKbPrEIfpD1tuqf+WA+4VyF1OtGzR9qWu +IGxpLJQUHFsYCtrqKwldbPINy0syjTuQpfeDKaNnMbmjNbCssPrkPZOTezgEXg7oE/C xplQ== 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=mfGVUl1Hm72bIfcel4d6Mnj7SfY3hOVcVVUtwXxF4KlidF8jE8AAJGAI6inIBmEWzx /lh6bS1f7Cv56vAyF/DgfRETJ/JcDrZt/T+KTe3eRB5Ap45KbBOcZ81NvJoqzcAcGNUY CmyBCxKXrOnNNNw+Vu/CPe6fJK3F7LhprH1mkOqpFV0uBeRSo/LdaLsjmOcHj0fc0gZ4 +r783/3KYf2jqZh/NDDwp9pkkONjwpFLoIX1EGodal+nFovYO+v8umT9YLgDBeMfrDT3 DDGiau6tTPuoaOfMdTwCVe4NqqUSpEoFOaSc6fxkMnF/WwOvSbFnJnRm51Od+PWgOiz9 Qy5A== X-Forwarded-Encrypted: i=1; AHgh+Rq1McEWFHG+L0mmsUyRU6JhOpMrBQ7M7bbjLRhPZkUSOcrzArgHVzQox+tx5cuSOLZffTI0WSNiZ+eb/LA=@vger.kernel.org X-Gm-Message-State: AOJu0YyKbawSTDrSct3cWqY59Ula+LeAKQHLNXv14H1bpGDThWR4ulT3 cTxe9Da/gvsZRTkfN5i/9dzGHuNWouijQf02GVg869J9xJYboGbI1xxJUePj+YK1xVXhnNAe X-Gm-Gg: AR+sD12CPxi4LYSNnKHwKsiw46/jaKdO/x+Q2H960gOF+Se3a6P+/gJ6NWOVOOZpzkW Ax9tEcG055bJ3TCjuvJeQZshqbCIcBLSndH9mSmL/chu9MAF/wX7wBbuQKOAda7z3/QL/zaHfYg 70g21dRTH+2vhIM9iGJAU1MqpPSaHJ8tEIElNb9dQXDLfh85MrWa49+r4Mzuk5fPRh/7SQpDjjB Qfyu4XkGWZdN6HAMaWNTvf9npxNWR6p5LsP61k4NN1Vda8Ettj6qF2uU+s9bsZbKNFTKi06bKaV 3FdcesforgrJ7wGIm7+LaF0KyrxJk9v52TO8z92LgYP7ym+zqY/lT4sFCWLlskyDWFw/HnSM5vJ /sppPTvdI7HWRUsneHZgRVmRQbPb6eJNMEz5tYS8jcJUjW4FgjbRPyrVsSxhM2BigAiEkV1JHzn 2xfH4klRgACY+IxZ0Q5hFOrg6rOvSvVlNf4EK5zIvoI2A5fwjFtcl1YHE= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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