From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
"David S. Miller" <davem@davemloft.net>,
Emil Renner Berthing <kernel@esmil.dk>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Jerome Brunet <jbrunet@baylibre.com>,
Keguang Zhang <keguang.zhang@gmail.com>,
Kevin Hilman <khilman@baylibre.com>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-mips@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Minda Chen <minda.chen@starfivetech.com>,
Neil Armstrong <neil.armstrong@linaro.org>,
netdev@vger.kernel.org,
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba>,
Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next 12/16] net: stmmac: stm32: use PHY_INTF_SEL_x to select PHY interface
Date: Fri, 07 Nov 2025 14:29:00 +0000 [thread overview]
Message-ID: <E1vHNSW-0000000DkSz-1TB4@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <aQ4ByErmsnAPSHIL@shell.armlinux.org.uk>
Convert dwmac-stm32 to use the PHY_INTF_SEL_x definitions.
For stm32mp1, the original definitions used constant 0 (GMII, 0 << 21),
BIT(21) (RGMII, 1 << 21) and BIT(23) (RMII, 4 << 21) to define these,
but from the values it can be clearly seen that these are the
PHY_INTF_SEL_x inputs to the dwmac.
For stm32mp2, the original definitions cover a bitfield 6:4 in the
SYSCFG Ethernet1 control register (according to documentation) and use
the PHY_INTF_SEL_x values.
Use the common dwmac definitions for the PHY interface selection field
by adding the bitfield mask, and using FIELD_PREP() for the bitfield
values.
This removes this incorrect use of BIT().
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-stm32.c | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index 6c179911ef3f..1545772419d5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -47,9 +47,13 @@
*------------------------------------------
*/
#define SYSCFG_PMCR_ETH_SEL_MII BIT(20)
-#define SYSCFG_PMCR_ETH_SEL_RGMII BIT(21)
-#define SYSCFG_PMCR_ETH_SEL_RMII BIT(23)
-#define SYSCFG_PMCR_ETH_SEL_GMII 0
+#define SYSCFG_PMCR_PHY_INTF_SEL_MASK GENMASK(23, 21)
+#define SYSCFG_PMCR_ETH_SEL_RGMII \
+ FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_RGMII)
+#define SYSCFG_PMCR_ETH_SEL_RMII \
+ FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_RMII)
+#define SYSCFG_PMCR_ETH_SEL_GMII \
+ FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_GMII_MII)
#define SYSCFG_MCU_ETH_SEL_MII 0
#define SYSCFG_MCU_ETH_SEL_RMII 1
@@ -60,9 +64,13 @@
#define SYSCFG_ETHCR_ETH_CLK_SEL BIT(1)
#define SYSCFG_ETHCR_ETH_REF_CLK_SEL BIT(0)
-#define SYSCFG_ETHCR_ETH_SEL_MII 0
-#define SYSCFG_ETHCR_ETH_SEL_RGMII BIT(4)
-#define SYSCFG_ETHCR_ETH_SEL_RMII BIT(6)
+#define SYSCFG_ETHCR_ETH_SEL_MASK GENMASK(6, 4)
+#define SYSCFG_ETHCR_ETH_SEL_MII FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
+ PHY_INTF_SEL_GMII_MII)
+#define SYSCFG_ETHCR_ETH_SEL_RGMII FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
+ PHY_INTF_SEL_RGMII)
+#define SYSCFG_ETHCR_ETH_SEL_RMII FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
+ PHY_INTF_SEL_RMII)
/* STM32MPx register definitions
*
--
2.47.3
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2025-11-07 14:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-07 14:27 [PATCH net-next 00/16] net: stmmac: convert glue drivers to use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 01/16] net: stmmac: loongson1: use PHY_INTF_SEL_x Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 02/16] net: stmmac: loongson1: use PHY_INTF_SEL_x directly Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 03/16] net: stmmac: loongson1: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 04/16] net: stmmac: mediatek: use PHY_INTF_SEL_xxx Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 05/16] net: stmmac: mediatek: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 06/16] net: stmmac: mediatek: simplify set_interface() methods Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 07/16] net: stmmac: meson8b: use PHY_INTF_SEL_xxx Russell King (Oracle)
2025-11-08 12:30 ` Martin Blumenstingl
2025-11-07 14:28 ` [PATCH net-next 08/16] net: stmmac: meson8b: use phy_intf_sel directly Russell King (Oracle)
2025-11-08 12:30 ` Martin Blumenstingl
2025-11-07 14:28 ` [PATCH net-next 09/16] net: stmmac: meson8b: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-08 12:31 ` Martin Blumenstingl
2025-11-07 14:28 ` [PATCH net-next 10/16] net: stmmac: starfive: use PHY_INTF_SEL_xxx to select PHY interface Russell King (Oracle)
2025-11-07 14:28 ` [PATCH net-next 11/16] net: stmmac: starfive: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 16:00 ` Emil Renner Berthing
2025-11-07 16:08 ` Russell King (Oracle)
2025-11-07 14:29 ` Russell King (Oracle) [this message]
2025-11-07 14:29 ` [PATCH net-next 13/16] net: stmmac: stm32: use PHY_INTF_SEL_x directly Russell King (Oracle)
2025-11-07 14:29 ` [PATCH net-next 14/16] net: stmmac: stm32: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 14:29 ` [PATCH net-next 15/16] net: stmmac: visconti: use PHY_INTF_SEL_x to select PHY interface Russell King (Oracle)
2025-11-07 14:29 ` [PATCH net-next 16/16] net: stmmac: visconti: use stmmac_get_phy_intf_sel() Russell King (Oracle)
2025-11-07 18:23 ` Maxime Chevallier
2025-11-08 7:58 ` Russell King (Oracle)
2025-11-09 16:38 ` Maxime Chevallier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1vHNSW-0000000DkSz-1TB4@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=angelogioacchino.delregno@collabora.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=jbrunet@baylibre.com \
--cc=keguang.zhang@gmail.com \
--cc=kernel@esmil.dk \
--cc=khilman@baylibre.com \
--cc=kuba@kernel.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=matthias.bgg@gmail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=minda.chen@starfivetech.com \
--cc=neil.armstrong@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=nobuhiro.iwamatsu.x90@mail.toshiba \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®