net: stmmac: use u32 for MDIO register field masks

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>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 978f90065681e45ecbd2ed179ad1e01187d3cf88..46454e2886ce9d4288b5ee261e55457225dcf923 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -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 {

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 6dfccc969d0e76d1a3f28c18083492f5cbd81173..a6f8e78856aa6234d631b6a29192543d88a487f8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -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;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 6b18072112db6476d8d11c862a0aadedcbcdb0f8..3ce03b059277917795ee3559d61c13c695c7d0a2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -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 */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 10acca806f4fa3b8422fa9c628ce045274e42bca..4ea55be04c5c9a70222c9ea1f00b59bccf87736b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -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;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 911753b9889eac196bdeccd2c8dbed809329d2db..7c91ea2775d410efaa96f2b7ab32428038de750c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -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;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 0e87590c806be282601e56a4d012cdd43645eaa1..602771e19d0fce4c3cf6e57fa1091b2febc59ac7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -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;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
index ba98e22f1c12992f6ad8c3a8e206481d5e1d0f96..915e7c2ab11f13421dbd6a4a80c491ec9ab19473 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
@@ -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;
 }