From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Chen-Yu Tsai <wens@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-sunxi@lists.linux.dev, netdev@vger.kernel.org,
Paolo Abeni <pabeni@redhat.com>,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH net-next 6/8] net: stmmac: use GENMASK_U32() for mdio bitfields
Date: Wed, 04 Mar 2026 10:22:57 +0000 [thread overview]
Message-ID: <E1vxjNZ-0000000Br1Q-1J2B@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <aagH023pvswd0tlT@shell.armlinux.org.uk>
Rather than using hex numbers, use GENMASK() for mdio bitfields.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 ++--
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 4 ++--
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index a6f8e78856aa..b913fe5af488 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -367,8 +367,8 @@ static int loongson_dwmac_setup(void *apriv, struct mac_device_info *mac)
mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
mac->mii.addr = GMAC_MII_ADDR;
mac->mii.data = GMAC_MII_DATA;
- mac->mii.addr_mask = 0x0000F800;
- mac->mii.reg_mask = 0x000007C0;
+ mac->mii.addr_mask = GENMASK_U32(15, 11);
+ mac->mii.reg_mask = GENMASK_U32(10, 6);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 4ea55be04c5c..c7cb30672604 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -496,8 +496,8 @@ int dwmac1000_setup(struct stmmac_priv *priv)
mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
mac->mii.addr = GMAC_MII_ADDR;
mac->mii.data = GMAC_MII_DATA;
- mac->mii.addr_mask = 0x0000F800;
- mac->mii.reg_mask = 0x000007C0;
+ mac->mii.addr_mask = GENMASK_U32(15, 11);
+ mac->mii.reg_mask = GENMASK_U32(10, 6);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 7c91ea2775d4..6b5cf3a0866a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -184,8 +184,8 @@ int dwmac100_setup(struct stmmac_priv *priv)
mac->link.speed_mask = MAC_CONTROL_PS;
mac->mii.addr = MAC_MII_ADDR;
mac->mii.data = MAC_MII_DATA;
- mac->mii.addr_mask = 0x0000F800;
- mac->mii.reg_mask = 0x000007C0;
+ mac->mii.addr_mask = GENMASK_U32(15, 11);
+ mac->mii.reg_mask = GENMASK_U32(10, 6);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
--
2.47.3
next prev parent reply other threads:[~2026-03-04 10:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 10:22 [PATCH net-next 0/8] net: stmmac: mdio related cleanups Russell King (Oracle)
2026-03-04 10:22 ` [PATCH net-next 1/8] net: stmmac: mdio: convert MDC clock divisor selection to tables Russell King (Oracle)
2026-03-04 10:22 ` [PATCH net-next 2/8] net: stmmac: mdio: use same test for MDC clock divisor lookups Russell King (Oracle)
2026-03-04 10:22 ` [PATCH net-next 3/8] net: stmmac: mdio: simplify MDC clock divisor lookup Russell King (Oracle)
2026-03-04 10:22 ` [PATCH net-next 4/8] net: stmmac: mdio: convert field prep to use field_prep() Russell King (Oracle)
2026-03-04 10:22 ` [PATCH net-next 5/8] net: stmmac: use u32 for MDIO register field masks Russell King (Oracle)
2026-03-04 10:22 ` Russell King (Oracle) [this message]
2026-03-04 10:23 ` [PATCH net-next 7/8] net: stmmac: mdio_bus_data->default_an_inband is boolean Russell King (Oracle)
2026-03-04 10:23 ` [PATCH net-next 8/8] net: stmmac: make pcs_mask and phy_mask u32 Russell King (Oracle)
2026-03-04 19:25 ` kernel test robot
2026-03-04 20:18 ` kernel test robot
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=E1vxjNZ-0000000Br1Q-1J2B@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=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=samuel@sholland.org \
--cc=wens@kernel.org \
/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