From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f7.google.com (mail-pj2-f7.google.com [74.125.227.135]) (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 ECF67472559 for ; Mon, 7 Sep 2026 15:39:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.135 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788795567; cv=none; b=jjY/ty/9H4auVX2GljpGgsRhaBs2EoArhXTboUgLy2sQutsb/DhX6v+IFTnQLHrBFQ3xAnNGbeF8xrIV2f8FeZxZqKmAV6qFZ++ZcHYVXt0QESMcf3t+chgDiMyrKD5SlFnfZ6517FwuWc6uscfTb3QiqChyN9nxMPRzyq220Mw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788795567; c=relaxed/simple; bh=iCQafZpFqsdcijM7wQ/VBsqWEiby6qk8Gp6Xz65rtD8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cMyejzmIRiYxYplooTeZPkoWKM9pzT1v8tYa4tm3Y7egdzk0xeca4ZbKTwEhaK38nfDV2uuL60sEgV/XriQOH1yDMXVJvrd3BxOjtnCiJbeEa1teUcfLo7gTzEulSDs2KuFfCLBJwVdLT2s5nNNEgnOG8JYtk06sS961RYWh7q4= 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=nq3peZFv; arc=none smtp.client-ip=74.125.227.135 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="nq3peZFv" Received: by mail-pj2-f7.google.com with SMTP id 98e67ed59e1d1-398e03cc38aso1351274a91.0 for ; Mon, 07 Sep 2026 08:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788795563; x=1789400363; 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=7inwahIcNU1aV9djAHi258zSUQz0eW0dslHEgzobBAI=; b=nq3peZFvmzK87LoeWIpAIpyGBN4zVxHSK9kgopmCrgyEeldFt3bSk8VWcWHZva4G+M SVGiyKBEPm4Ir3PYejzyUpBa7ZBSbA5yNPUPaAMjPACDzgWDEnQIy1t2NsARUl4fWpVD UYLj3SOR+U4AExfQ9i66C9rrPsh4hs6RmYTT8/2kt7cggshcb6LcB5l5nrSSEB/xkFdn Uuy3weqqrUSWxSFFFxDXvdd/EQQWFOvePMqmu0h5R3gUltD73wuNl4S3MBY9DyKHw4KO PEkYUQAUrmNcVuVDfKhqp9isRC9/mALt3xVq0gJr+0YY5P4NSE06gIAxPJDBOv2gweYa MnHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788795563; x=1789400363; 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=7inwahIcNU1aV9djAHi258zSUQz0eW0dslHEgzobBAI=; b=HAZkNnCYqZYEss2DS4E6tvaP3wBlXoIcgYNhuIxZgOFZ8ii4TIclLau+6MAqYbCg3f QKAMVpM4dCJkeMqMFCuc5hvA1uov51z0gXNsdfPSIqHsi8Zsca7GcCF9dXq++zXSa9eq 8DptaMG0eL46GWh8GenOHH0c5P+k6s7XzZOJz+JgZ34+fg1dNcixG0RdyOJMM39hdjv0 V/jUezBz+XnwcWR7EvuUVvcPBnxRti4HfEuc2zIrTXJ3UTLRu5N+Rig2xZ0GZ8pfD3ul MHwUXmK5+PcMb0Odhpk/m9bqoQzLOq18Nbe7y2H20RqLYq2R3+NVxG9+PpzRcxjTk+G1 RpcQ== X-Forwarded-Encrypted: i=1; AKwUvBxty11Xz7057bEWtesEtLvGPwN9Or0eofS9CxV0VRJJPKGv/X7BR2K49E7unW8VJYchRn70caSuGz/FDS4=@vger.kernel.org X-Gm-Message-State: AFuF++lc+QC8pE8yEdB2IcHvGo7baWOf4GdhN+aL0uXn91fuh5T36R2Q ATHqpbJUVoGIHFWnd1G78arIPbH7K2yfJEfFptzdXxdTRhImGrfseSVC X-Gm-Gg: AYBFou1PbPvDSZPO9WRfz8Zf01Dvuv18QgjcIq/0+xRbJY86EtoGCz5a7jyC4ZVK2FT 7JUqhLgBag1UEeuo5xdlWMQKLkTwakBNTtodLFsnat6SKCoEQ7TdNPeI7jMlfz6aeJaugKJGJEd Rd0sfELitJtLLqDIbebncnSLiZS7y9rswN03aZGHD87YDab5JF+ZbLi+m/hcsbveJJVOrHUdluW viWIJMddAvBQIUqYsQAzC7ifB0mOamKeplrzeMBMVXVdq16yE64KbgAGCOZaowRENXIX0++gmZg C16wMdOsCSoY+m6JeGqy6fX/MOmx8j20KJR4BFpTD14GB3DiaKOKUdoSzW6zPhtIKi88eV+OkOc dhU0u1e0hgHqAZeKoDCQZcc203ahRhzuMfKDAGDsfcoHL5E1KIb1cKMTQCIt4bAmd/r3Uwvfj0p qRR4flKEY2iUnSpnjNDeH1UaoFwKMFFrpVq2QZSKeoZrIq7LLpk8MaJ5j9krE= X-Received: by 2002:a17:90b:384b:b0:38e:524:8797 with SMTP id 98e67ed59e1d1-39b261e79f1mr34240199a91.13.1788795562857; Mon, 07 Sep 2026 08:39:22 -0700 (PDT) Received: from server.lan ([150.230.217.250]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39b260fdf9asm21690121a91.9.2026.09.07.08.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 08:39:22 -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 net-next v4 06/10] net: pcs: xpcs: add ANRESTART support for SGMII link recovery Date: Mon, 7 Sep 2026 23:37:09 +0800 Message-ID: <20260907153713.2572547-8-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260907153713.2572547-2-coiaprant@gmail.com> References: <20260907153713.2572547-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. Tested-by: Jiawen Wu Tested-by: Maxime Chevallier Signed-off-by: Coia Prant --- drivers/net/pcs/pcs-xpcs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 0337e2bcc0125..50b9cdf94fdaa 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; } @@ -1093,10 +1098,15 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, 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