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 73A4E3597B; Fri, 23 Jan 2026 10:03:45 +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=1769162637; cv=none; b=Aa9awwI5CqqiP8MkFCfcb8hGTSZMNUAZ43Ak//KpfGV5/DmCOwq03+H0eWwNapDlgqhGENeSeIBH4UWSYMkwMCgL43hLO//bcIRgUf1xWdgLbp8F5iLx2iUzrcmyuJYEDuZMmCvt+x4RXnWU37mwpfYGvzSjVUtKCTFd+Wtboic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769162637; c=relaxed/simple; bh=VtrB4mm/xv711LGSheTTBDWDJjZfcyiPYFkjJxEMfwM=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=UCAaD4XW6b+h1dct0tid6pAtSKQZcQ352AjYMkRJjKP3+SHU2i74OAIrJcQUnieqCKSkMMmcJyRp2I1wg4t5Qsqzj4xSE8mTwJmVZQBwgyCPhHZb1RydcKYi7J0isd7Hv7EP+HB1xjFKPnbH0KD3wYH4nUYU8oWux9hT/hCOX1A= 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=XPrgXBGs; 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="XPrgXBGs" 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=4ycZpKPqCdkchXzTFV2OBU4or3R/JWa0ZIOE06LOM78=; b=XPrgXBGsOHAHViUrOSkZh3DKY/ 03IQrDsAbyvyhsWnohaa+J5n1km6DPsPufha6LDoe15m2usbeeMtRHLkNBIjz/tZK7W+54aFa+0sG Z/p1g3s5POlJtzW1eWdGx2Xi+2X5LYvbK/MumDcA3oetGyLLLsnVOmOZU3CcOMj+zo8TfSJT8PEpf sMHTcM8t8PbAsUCNm1v3wCf1ilhsx4HQhtMRO+PJxBF/MCLQqoS9K0G1/+cCpvCIVMwaKtsfr9iQn X8UxFLM25TUlI3Px7WPwwBWoH6+KW3NJTN7C7rzcUgFw+XxY8IVZcwGRwfSk7L7XgTjxKkJe85aSe wpuXileA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:48066 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 1vjDsA-000000001dM-33ln; Fri, 23 Jan 2026 09:54:34 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vjDs1-00000005fRC-0tI1; Fri, 23 Jan 2026 09:54:25 +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 , 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 Chevallier , Maxime Coquelin , Mohd Ayaan Anwar , Neil Armstrong , netdev@vger.kernel.org, Paolo Abeni , Vinod Koul Subject: [PATCH net-next v2 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: Fri, 23 Jan 2026 09:54:25 +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) --- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 4 ++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 ++-- .../net/ethernet/stmicro/stmmac/stmmac_pcs.c | 20 ++++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index 18a0b678295d..31f6ac5432f2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -24,8 +24,8 @@ static const struct stmmac_pcs_info dwmac1000_pcs_info = { .pcs_offset = GMAC_PCS_BASE, - .rsgmii_offset = GMAC_RGSMIIIS, - .rsgmii_status_mask = GMAC_RSGMIIIS_MASK, + .rgsmii_offset = GMAC_RGSMIIIS, + .rgsmii_status_mask = GMAC_RSGMIIIS_MASK, .int_mask = GMAC_INT_DISABLE_PCSLINK | GMAC_INT_DISABLE_PCSAN, }; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index e7836bb27a9b..ced2cd98cc54 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -24,8 +24,8 @@ static const struct stmmac_pcs_info dwmac4_pcs_info = { .pcs_offset = GMAC_PCS_BASE, - .rsgmii_offset = GMAC_PHYIF_CONTROL_STATUS, - .rsgmii_status_mask = GMAC_PHYIF_CTRLSTATUS_RSGMII_MASK, + .rgsmii_offset = GMAC_PHYIF_CONTROL_STATUS, + .rgsmii_status_mask = GMAC_PHYIF_CTRLSTATUS_RSGMII_MASK, .int_mask = GMAC_INT_PCS_LINK | GMAC_INT_PCS_ANE, }; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c index 3b450e7f794c..978f66ea51f3 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; @@ -164,8 +165,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) { @@ -182,12 +184,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