mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 07:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: stmmac: use u32 for MDIO register field masks

Browse Source 
MDIO registers are 32-bit, so use u32 to describe the masks for these
registers. Convert the GENMASK() initialisers to GENMASK_U32() for
type compatibility.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1vy6AJ-0000000Btx1-1teC@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle)
2026-03-05 10:42:47 +00:00
committed by Jakub Kicinski
parent 58bd003900
commit df388b4d39
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/stmicro/stmmac/common.h
View File

@@ -608,9 +608,9 @@ struct mac_link {
struct mii_regs {
unsigned int addr; /* MII Address */
unsigned int data; /* MII Data */
unsigned int addr_mask; /* MII address mask */
unsigned int reg_mask; /* MII reg mask */
unsigned int clk_csr_mask;
u32 addr_mask; /* MII address mask */
u32 reg_mask; /* MII reg mask */
u32 clk_csr_mask;
};
struct mac_device_info {

2
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
View File

@@ -369,7 +369,7 @@ static int loongson_dwmac_setup(void *apriv, struct mac_device_info *mac)
mac->mii.data = GMAC_MII_DATA;
mac->mii.addr_mask = 0x0000F800;
mac->mii.reg_mask = 0x000007C0;
mac->mii.clk_csr_mask = GENMASK(5, 2);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
}

6
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
View File

@@ -1063,9 +1063,9 @@ static int sun8i_dwmac_setup(void *ppriv, struct mac_device_info *mac)
mac->link.duplex = EMAC_DUPLEX_FULL;
mac->mii.addr = EMAC_MDIO_CMD;
mac->mii.data = EMAC_MDIO_DATA;
mac->mii.reg_mask = GENMASK(8, 4);
mac->mii.addr_mask = GENMASK(16, 12);
mac->mii.clk_csr_mask = GENMASK(22, 20);
mac->mii.reg_mask = GENMASK_U32(8, 4);
mac->mii.addr_mask = GENMASK_U32(16, 12);
mac->mii.clk_csr_mask = GENMASK_U32(22, 20);
mac->unicast_filter_entries = 8;
/* Synopsys Id is not available */

2
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
View File

@@ -498,7 +498,7 @@ int dwmac1000_setup(struct stmmac_priv *priv)
mac->mii.data = GMAC_MII_DATA;
mac->mii.addr_mask = 0x0000F800;
mac->mii.reg_mask = 0x000007C0;
mac->mii.clk_csr_mask = GENMASK(5, 2);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
}

2
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
View File

@@ -186,7 +186,7 @@ int dwmac100_setup(struct stmmac_priv *priv)
mac->mii.data = MAC_MII_DATA;
mac->mii.addr_mask = 0x0000F800;
mac->mii.reg_mask = 0x000007C0;
mac->mii.clk_csr_mask = GENMASK(5, 2);
mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
return 0;
}

6
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
View File

@@ -1030,9 +1030,9 @@ int dwmac4_setup(struct stmmac_priv *priv)
mac->link.speed_mask = GMAC_CONFIG_FES | GMAC_CONFIG_PS;
mac->mii.addr = GMAC_MDIO_ADDR;
mac->mii.data = GMAC_MDIO_DATA;
mac->mii.addr_mask = GENMASK(25, 21);
mac->mii.reg_mask = GENMASK(20, 16);
mac->mii.clk_csr_mask = GENMASK(11, 8);
mac->mii.addr_mask = GENMASK_U32(25, 21);
mac->mii.reg_mask = GENMASK_U32(20, 16);
mac->mii.clk_csr_mask = GENMASK_U32(11, 8);
mac->num_vlan = stmmac_get_num_vlan(priv->ioaddr);
return 0;

12
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
View File

@@ -1551,9 +1551,9 @@ int dwxgmac2_setup(struct stmmac_priv *priv)
mac->mii.addr = XGMAC_MDIO_ADDR;
mac->mii.data = XGMAC_MDIO_DATA;
mac->mii.addr_mask = GENMASK(20, 16);
mac->mii.reg_mask = GENMASK(15, 0);
mac->mii.clk_csr_mask = GENMASK(21, 19);
mac->mii.addr_mask = GENMASK_U32(20, 16);
mac->mii.reg_mask = GENMASK_U32(15, 0);
mac->mii.clk_csr_mask = GENMASK_U32(21, 19);
mac->num_vlan = stmmac_get_num_vlan(priv->ioaddr);
return 0;
@@ -1591,9 +1591,9 @@ int dwxlgmac2_setup(struct stmmac_priv *priv)
mac->mii.addr = XGMAC_MDIO_ADDR;
mac->mii.data = XGMAC_MDIO_DATA;
mac->mii.addr_mask = GENMASK(20, 16);
mac->mii.reg_mask = GENMASK(15, 0);
mac->mii.clk_csr_mask = GENMASK(21, 19);
mac->mii.addr_mask = GENMASK_U32(20, 16);
mac->mii.reg_mask = GENMASK_U32(15, 0);
mac->mii.clk_csr_mask = GENMASK_U32(21, 19);
return 0;
}