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 C6929C44507 for ; Tue, 14 Jul 2026 19:14:36 +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=aoOE61isMDDd8GP85+DE7oVM8lZchbPwwJGNjzXuY8g=; b=mIrSBZard9LFxEiQAVM9yZEexa rduJew+w6lrUwiU7z/ilXs8dOTItbWCmpuPLAAmHUbLpY2xJlvfcpK8rD+mwXk3bCWJf0JXrnj56I MiD6tPmNFffDe66S/umKb4JO0uE2q9RWkS51Yuyw4FUPCQ05HAMbn4yaRu0AbzJqF/5DmwHlU8A9L 45bmEPaGSfdRsjygbYgRi5cVklZhLbl4rzfPOwQrIYT6FoqJZcWoEuTXsXWgcIu9lrFvSIOKXkyt1 J0o86OkUTw0C9V7FyKITnufeUa1oQr7N4XvLrMgzHFK1oUMJKI1Z0ReCJLQk6wytIArqMWpotU1PQ LeFG5G+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjiaK-0000000D0H2-2oHA; Tue, 14 Jul 2026 19:14:28 +0000 Received: from mail-pj2-x02.google.com ([2607:f8b0:4864:39::2]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjiaG-0000000D0BL-0e8j for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2026 19:14:25 +0000 Received: by mail-pj2-x02.google.com with SMTP id d9443c01a7336-2ccbff2e6a7so31004935ad.1 for ; Tue, 14 Jul 2026 12:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784056463; x=1784661263; 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=aoOE61isMDDd8GP85+DE7oVM8lZchbPwwJGNjzXuY8g=; b=PcqndnnpmAl+4D4kICKoxDGMMn4b8kE2aEr2bY/dPy1AjfICW9+M3TvvKiYTWgywPB vcnn2iPdav5zB90uX+77r6vCiibGnpfFtvp2M2/dCRgNPgfXNarLJMcdwik+q3WOnPYh U93nz3vWcDWRryOVbkn+U+YHgGEEdyOzoqEtYmPmK64qmJIdW54h6kh+QmqoZkQ1M8x6 AY8//TTqIp/AArmq3Y4tkIlSMc05yDJ9RH+EuwrpLC9FkFZKLCXDW7MCs1pd/kz9G8CQ HhpBI1n5DMyBhT24rkttDKWLrJzZJpQ+ndU0X8NPAORSnuAsQiizB9FlQaCMC9jNqhxe ZAHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784056463; x=1784661263; 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=aoOE61isMDDd8GP85+DE7oVM8lZchbPwwJGNjzXuY8g=; b=GbEwkgpOcwiiBnAkAEOSi5ofSAG6ahlT7gn3jHE+N/xkiiS8svxkYD0gVhlQXY+iQW VfOwzFxxO2Sb7MGi/Ymy3HlyNpHct2Q7mxebWFutEJ5W68gEugimh9OFUUt+VM4NkwIc 7w3A6xW6mLqbXX+SiKcZmgQCq8fK3+m8wg1K4lRe5F2JfdDQAOGWXsUyEAaM9uNxLVml 3tGqYEErvOgWSV+3/+2+XeeT+RL8VWKmETCPG0A/Vzk/Zn5C1gbwvsZNak2VOvI3iJih saYVG5JxM8qHHaEkVospHfJUVVdbXpWX/fXMjnVsKGJPgwUaHCadk64lwfRXSQTGMdQL TcdQ== X-Forwarded-Encrypted: i=1; AHgh+RrFiDdN1r7kxDc9T4Q2uVUMnJkSh+PG0DjU24pKVhdBEaBbwzitCnJOqIPVyQAVw7I2Gvnp+9FJbo6n7QWqzHtP@lists.infradead.org X-Gm-Message-State: AOJu0YxIhQgZMpODN5n+kxOVbk7i27LjBrF5G1wOcXbTAe/bVxFs87uF KyI0Z183SQvDGvnquJrk4iAJ/a2TZ7kwFFo1r9Qyei5NS5Ezyanw7Ll7 X-Gm-Gg: AfdE7clXbg7mE30CzXJVlYj9HduLsNXXDcIdjU8/38P5G6eg1QrqRGJ+fI0f4wN+Tnw lfR8JcqzVAVLo8sOrED2Ewq7kZL+gtzrXv4MP51jPxFahulE68j4622p5AApY8JcwwnMpXKDTax BO3/0uJuLv07b9t7z27jzC2x1G2IRtlutCV+BMUZ46AWwbaDeZo0lMyrbRp9Zyjor91PmT1DoUa /lWdmWtzyxt+LwWmpkb41OvDGMELFVIoMfYE1/zpBl6z+6rRFvGmOnTw0T9kJ2yyfCIZhbnuQ2g rkmqshiubnSB2kEcpo0w48JUvDyBRn+ZOf7Ur9/Emo76Mt+ntb33RptMzkL1JQFQ9MinFPomiga wEZmt4RkcLP5a1wj5KdMi2/ulUUm8344nhRWGRuDNvFPtfjr7goR7Ez547YiPmFMJ0sSK6M9+s6 ryw4s+B+l7aGs= X-Received: by 2002:a17:902:da81:b0:2ca:cee0:e172 with SMTP id d9443c01a7336-2cef12fc5a6mr38647055ad.30.1784056463494; Tue, 14 Jul 2026 12:14:23 -0700 (PDT) Received: from server.lan ([150.230.217.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3d451sm120763245ad.65.2026.07.14.12.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2026 12:14:22 -0700 (PDT) From: Coia Prant To: kuba@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, robh@kernel.org, krzk+dt@kernel.org, heiko@sntech.de Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, Coia Prant Subject: [RFC PATCH 06/10] net: pcs: xpcs: improve SGMII AN state handling for Rockchip RK3568 Date: Wed, 15 Jul 2026 03:08:34 +0800 Message-ID: <20260714191341.690906-7-coiaprant@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260714191341.690906-1-coiaprant@gmail.com> References: <20260714191341.690906-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-20260714_121424_240259_793ACB90 X-CRM114-Status: GOOD ( 18.43 ) 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 Commit 2a22b7ae2fa3 ("net: pcs: xpcs: adapt Wangxun NICs for SGMII mode") added support for reading CL37_ANCMPLT_INTR and then reading BMCR for speed/duplex. This may work on Wangxun hardware but not on RK3568. On RK3568, reading BMCR returns a fixed value (HW Reset Value or Write Manual) instead of the negotiated result, so the correct speed/duplex must be read from CL37_ANSGM_STS. Also, when the link is down, CL37_ANCMPLT_INTR stays set and the PCS does not restart AN automatically when the PHY link returns, so an explicit AN restart via BMCR_ANRESTART is needed. Modify xpcs_get_state_c37_sgmii() to check CL37_ANSGM_STS for link status first. If the link is up, report the state. If AN is complete (CL37_ANCMPLT_INTR set), clear the interrupt and restart AN for non-Wangxun platforms. The original Wangxun-specific path is kept unchanged unless we confirm it's a bug not a feature. Also clear CL37 AN complete status in xpcs_config_aneg_c37_sgmii() before starting AN to ensure a clean initial state. Fixes: 2a22b7ae2fa3 ("net: pcs: xpcs: adapt Wangxun NICs for SGMII mode") Signed-off-by: Coia Prant --- drivers/net/pcs/pcs-xpcs.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index e69fa2f0a0e8d..cf370ba247cac 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -816,6 +816,11 @@ 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); @@ -884,7 +889,7 @@ static int xpcs_config_aneg_c37_1000basex(struct dw_xpcs *xpcs, 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); if (ret < 0) return ret; } @@ -1058,6 +1063,7 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, /* Reset link_state */ state->link = false; + state->an_complete = false; state->speed = SPEED_UNKNOWN; state->duplex = DUPLEX_UNKNOWN; state->pause = 0; @@ -1069,6 +1075,8 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, if (ret < 0) return ret; + state->an_complete = ret & DW_VR_MII_AN_STS_C37_ANCMPLT_INTR; + if (ret & DW_VR_MII_C37_ANSGM_SP_LNKSTS) { int speed_value; @@ -1086,7 +1094,24 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, state->duplex = DUPLEX_FULL; else state->duplex = DUPLEX_HALF; - } else if (ret == DW_VR_MII_AN_STS_C37_ANCMPLT_INTR) { + + 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 (xpcs->info.pma != WX_TXGBE_XPCS_PMA_10G_ID) { + /* If the link down, restart Auto-Negotiation */ + if (state->an_complete) + xpcs_modify(xpcs, MDIO_MMD_VEND2, MII_BMCR, BMCR_ANRESTART, + BMCR_ANRESTART); + + return 0; + } + + if (ret == DW_VR_MII_AN_STS_C37_ANCMPLT_INTR) { int speed, duplex; state->link = true; @@ -1112,7 +1137,7 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs, else if (duplex & ADVERTISE_1000XHALF) state->duplex = DUPLEX_HALF; - xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS, 0); + return 0; } return 0; -- 2.47.3