From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DB942C11CB; Wed, 14 Jan 2026 17:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768413528; cv=none; b=Ragd6NQ8FPEm3yoRCIQr6RPp8wAv8XHyaG7EEdYEtgM6GqTLBY50bys7cHrARCPXlLR1dK53ZQlFZgiP3zUyLciYpVrpMBbbLP/c1gQNOJBmUcVkqtrewF9ZnUqvgcll70KboQEo49DTAgiZSgVaouJsu2xBwkJTmDlr2jHNvnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768413528; c=relaxed/simple; bh=w35owlorc/xzuhae0OutjIUwW6wrgtoBe9yLmkSRDmg=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=QT6hkxtqTiMxJQPHo/ck4WWcvcpKpAL62MLgosPSl9drKuTsUTJmyt0K0pCef9I7qH8UNbJmZ9HxcEWvOyq6g1O+sghGQHKwzTVis3iIrMMBpPU4Gm4Us77/IBdh0nawaqXacpFOenvXqvSKlHDU0ckXZQfjcM8J2Xa465u2Dj8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=WqFYeThM; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="WqFYeThM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMrcDmPGftWX4lzl5mXX46jAy7LO9GU7b1EdpEz0imo=; b=WqFYeThMebzFQDzueOx+gnKT1A s/lLuoJXFBu6enNaDVJAYg4+FBM2XEZlFTa/rvy1XS3J/W5SS4UIOScLPUMC/1uyAJDvouErxtW6Z X6BtElxQXnd0qUDEIWmiIENcdv9jUxLUttrHrNeJpUzkvrNOPlbJZA4m0sMy04lDtHOuVcipHzW5V P00HksKLtJ5tIzNwPp0O3rWkQFonwwreJT+sVLP0iC2cAtM9XmiJYUi3ss0w6tBOONULF+cpK7sIQ UjvCiCNDGLnoKtVL0BORfxXGpSoYJqtmvSMHU0V9Ac5qPgk3KvnpSdZt07kOkLDq83hQDfyakg4lo 7K4lEhTw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:41104 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vg4wm-000000000WE-1G3X; Wed, 14 Jan 2026 17:46:20 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vg4wh-00000003SGr-26ZJ; Wed, 14 Jan 2026 17:46:15 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Konrad Dybcio , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , Mohd Ayaan Anwar , Neil Armstrong , netdev@vger.kernel.org, Paolo Abeni , Vinod Koul Subject: [PATCH net-next 13/14] net: stmmac: configure SGMII AN control according to phylink Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Wed, 14 Jan 2026 17:46:15 +0000 Provide phylink with the integrated PCS autonegotiation capabilities, and configure the PCS's AN settings according to phylink's requested requirements. This may cause regressions. Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/stmmac_pcs.c | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c index 12fc5038d913..44f82e6c1edb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c @@ -65,7 +65,8 @@ static int dwmac_integrated_pcs_validate(struct phylink_pcs *pcs, static unsigned int dwmac_integrated_pcs_inband_caps(struct phylink_pcs *pcs, phy_interface_t interface) { - if (phy_interface_mode_is_8023z(interface)) + if (phy_interface_mode_is_8023z(interface) || + interface == PHY_INTERFACE_MODE_SGMII) return LINK_INBAND_ENABLE | LINK_INBAND_DISABLE; return 0; @@ -160,8 +161,9 @@ static int dwmac_integrated_pcs_config(struct phylink_pcs *pcs, bool permit_pause_to_mac) { struct stmmac_pcs *spcs = phylink_pcs_to_stmmac_pcs(pcs); - bool changed = false, ane = true; - u32 adv; + void __iomem *an_control = spcs->base + GMAC_AN_CTRL(0); + bool changed = false; + u32 adv, ctrl; int ret; if (spcs->interface != interface) { @@ -178,12 +180,16 @@ static int dwmac_integrated_pcs_config(struct phylink_pcs *pcs, if (readl(spcs->base + GMAC_ANE_ADV) != adv) changed = true; writel(adv, spcs->base + GMAC_ANE_ADV); - - ane = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED; } - dwmac_ctrl_ane(spcs->base, 0, ane, - spcs->priv->hw->reverse_sgmii_enable); + ctrl = readl(an_control) & ~(GMAC_AN_CTRL_ANE | GMAC_AN_CTRL_SGMRAL); + if (spcs->priv->hw->reverse_sgmii_enable) + ctrl |= GMAC_AN_CTRL_SGMRAL | GMAC_AN_CTRL_ANE; + else if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) + ctrl |= GMAC_AN_CTRL_ANE; + else + ctrl |= GMAC_AN_CTRL_SGMRAL; + writel(ctrl, an_control); return changed; } -- 2.47.3