From nobody Sat Oct 4 14:12:51 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 29A012E5D01; Fri, 15 Aug 2025 16:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755276926; cv=none; b=aD69kpTPqkbDUizQQluH4KKtyiitR1Dev4d8d4SPlcuCL6oN2jbVFd7JZ2AL+Orxn76uEAJPD0hPcJgwpXybEWqGNHUbBFEcOZs0Ta2X+Ufofa62H42WO2jkT6duUVZ3s6Zadp9Q2gAogtFaAXKusE7SaijZvg5g5q8xG5oC480= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755276926; c=relaxed/simple; bh=6xBCAXnSlcx0bxZ2sjWbWn7Mur09UyOs+oTuzhzmA4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tqLtjQye+talf3QGEPDA7ccZJeYd7zTkLJlViVPNDHVeq1yYF9vyGexjxlianjdAahVE8xIJ7Xz2Dqa+3KugNW41BP4MQXH+f+f/K5JdMeWTaRlABKnZppR1C8z4BF1YY507lUxuGtc1v6RZ3qd2YXkY18j4DWpDmXOwPudFNBc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u9qsoYtY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="u9qsoYtY" Received: by smtp.kernel.org (Postfix) with ESMTPS id DEE28C4CEEB; Fri, 15 Aug 2025 16:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755276925; bh=6xBCAXnSlcx0bxZ2sjWbWn7Mur09UyOs+oTuzhzmA4E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=u9qsoYtY8xbYZ62xiDLN2pNUkxMPq+P8OJKsfLpLbk/e4cN3+NwnyP4WyWtue/jmQ vaXDxlTXA0dGpVLyw+MM8WqrpU7RLfaVM66oemPeruiCR4o+Jrp4JARDBMG42/oxM7 d88Jn+d0MDNbBGqIWg3fItjbJk4CgNPrMWtf3v3VX2nrL5gooQm0+2LbtiyPEMGJWT BWqtr/w4I7KM7ZyqJKpeOzfwWbIeo3Lxk1dz3XiQbTCeNqQETPg6cNcwbyuRNhaU7m KRY9p5yOfjWXBE0ZvcWiXLBzuh5PbCMY6YL/8L/tWkFUlVblLg2P8ARh22MmE3QYFG 4jtCs1GxjUBtg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1483CA0EE9; Fri, 15 Aug 2025 16:55:25 +0000 (UTC) From: Rohan G Thomas via B4 Relay Date: Sat, 16 Aug 2025 00:55:24 +0800 Subject: [PATCH net-next v2 2/3] net: stmmac: xgmac: Correct supported speed modes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250816-xgmac-minor-fixes-v2-2-699552cf8a7f@altera.com> References: <20250816-xgmac-minor-fixes-v2-0-699552cf8a7f@altera.com> In-Reply-To: <20250816-xgmac-minor-fixes-v2-0-699552cf8a7f@altera.com> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Serge Semin , Romain Gantois , Jose Abreu , Ong Boon Leong Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rohan G Thomas , Matthew Gerlach X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1755276924; l=3618; i=rohan.g.thomas@altera.com; s=20250815; h=from:subject:message-id; bh=6eGqFb1P97Yuh/qwyhD4J2RxKPXc8iQ4mAKJ/Gaog14=; b=sS1sFpVUZEdaR1i/EWOsh3aSr1uMvAn4QF0IyWlIZCG0RUR15KLjXCU+GLHuNspxJCNcqz+x9 4ZfPlJ4tFGKC+mEafY40fO7taTEU3awXeEsWJEe8KBPsQu4atO8Vj/Y X-Developer-Key: i=rohan.g.thomas@altera.com; a=ed25519; pk=5yZXkXswhfUILKAQwoIn7m6uSblwgV5oppxqde4g4TY= X-Endpoint-Received: by B4 Relay for rohan.g.thomas@altera.com/20250815 with auth_id=494 X-Original-From: Rohan G Thomas Reply-To: rohan.g.thomas@altera.com From: Rohan G Thomas Correct supported speed modes as per the XGMAC databook. Commit 9cb54af214a7 ("net: stmmac: Fix IP-cores specific MAC capabilities") removes support for 10M, 100M and 1000HD. 1000HD is not supported by XGMAC IP, but it does support 10M and 100M FD mode for XGMAC version >=3D 2_20, and it also supports 10M and 100M HD mode if the HDSEL bit is set in the MAC_HW_FEATURE0 reg. This commit enables support for 10M and 100M speed modes for XGMAC IP based on XGMAC version and MAC capabilities. Fixes: 9cb54af214a7 ("net: stmmac: Fix IP-cores specific MAC capabilities") Signed-off-by: Rohan G Thomas Reviewed-by: Matthew Gerlach --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 13 +++++++++++-- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/= net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 6cadf8de4fdfdb18af1a112b883b3d33a53da638..00e929bf280baec7aa8d2a75fc5= ceea4a52c9979 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -49,6 +49,14 @@ static void dwxgmac2_core_init(struct mac_device_info *h= w, writel(XGMAC_INT_DEFAULT_EN, ioaddr + XGMAC_INT_EN); } =20 +static void dwxgmac2_update_caps(struct stmmac_priv *priv) +{ + if (!priv->dma_cap.mbps_10_100) + priv->hw->link.caps &=3D ~(MAC_10 | MAC_100); + else if (!priv->dma_cap.half_duplex) + priv->hw->link.caps &=3D ~(MAC_10HD | MAC_100HD); +} + static void dwxgmac2_set_mac(void __iomem *ioaddr, bool enable) { u32 tx =3D readl(ioaddr + XGMAC_TX_CONFIG); @@ -1424,6 +1432,7 @@ static void dwxgmac2_set_arp_offload(struct mac_devic= e_info *hw, bool en, =20 const struct stmmac_ops dwxgmac210_ops =3D { .core_init =3D dwxgmac2_core_init, + .update_caps =3D dwxgmac2_update_caps, .set_mac =3D dwxgmac2_set_mac, .rx_ipc =3D dwxgmac2_rx_ipc, .rx_queue_enable =3D dwxgmac2_rx_queue_enable, @@ -1532,8 +1541,8 @@ int dwxgmac2_setup(struct stmmac_priv *priv) mac->mcast_bits_log2 =3D ilog2(mac->multicast_filter_bins); =20 mac->link.caps =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | - MAC_1000FD | MAC_2500FD | MAC_5000FD | - MAC_10000FD; + MAC_10 | MAC_100 | MAC_1000FD | + MAC_2500FD | MAC_5000FD | MAC_10000FD; mac->link.duplex =3D 0; mac->link.speed10 =3D XGMAC_CONFIG_SS_10_MII; mac->link.speed100 =3D XGMAC_CONFIG_SS_100_MII; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/n= et/ethernet/stmicro/stmmac/dwxgmac2_dma.c index 7201a38842651a865493fce0cefe757d6ae9bafa..18e92b3c6df4200c51ee56f9231= 58e3ae1cf5ef8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c @@ -384,6 +384,9 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, { u32 hw_cap; =20 + struct stmmac_priv *priv =3D container_of(dma_cap, struct stmmac_priv, + dma_cap); + /* MAC HW feature 0 */ hw_cap =3D readl(ioaddr + XGMAC_HW_FEATURE0); dma_cap->edma =3D (hw_cap & XGMAC_HWFEAT_EDMA) >> 31; @@ -406,6 +409,8 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, dma_cap->vlhash =3D (hw_cap & XGMAC_HWFEAT_VLHASH) >> 4; dma_cap->half_duplex =3D (hw_cap & XGMAC_HWFEAT_HDSEL) >> 3; dma_cap->mbps_1000 =3D (hw_cap & XGMAC_HWFEAT_GMIISEL) >> 1; + if (dma_cap->mbps_1000 && priv->synopsys_id >=3D DWXGMAC_CORE_2_20) + dma_cap->mbps_10_100 =3D 1; =20 /* MAC HW feature 1 */ hw_cap =3D readl(ioaddr + XGMAC_HW_FEATURE1); --=20 2.32.0