enetc: code cleanups
Subsystems (3)
cover enetc: code cleanups
This are some code cleanups in the MDIO part of the enetc. They are intended to make the code more readable.
Michael Walle (4):
enetc: drop unneeded indirection
enetc: don't use macro magic for the readx_poll_timeout() callback
enetc: drop MDIO_DATA() macro
enetc: reorder macros and functions
.../net/ethernet/freescale/enetc/enetc_mdio.c | 61 +++++++++---------- 1 file changed, 29 insertions(+), 32 deletions(-)
Signature · 1 line
2.20.1
PATCH RESEND 1/4 enetc: drop unneeded indirection
Before commit 6517798dd343 ("enetc: Make MDIO accessors more generic and export to include/linux/fsl") these macros actually had some benefits. But after the commit it just makes the code hard to read. Drop the macro indirections.
--- .../net/ethernet/freescale/enetc/enetc_mdio.c | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_mdio.c +14 -18
@@ -14,21 +14,17 @@#define ENETC_MDIO_DATA 0x8/* MDIO data */ #define ENETC_MDIO_ADDR 0xc/* MDIO address */ -static inline u32 _enetc_mdio_rd (struct enetc_mdio_priv *mdio_priv,int off) +static inline u32 enetc_mdio_rd (struct enetc_mdio_priv *mdio_priv,int off) {return enetc_port_rd_mdio (mdio_priv->hw, mdio_priv->mdio_base + off); } -static inline void _enetc_mdio_wr (struct enetc_mdio_priv *mdio_priv,int off, -u32 val) +static inline void enetc_mdio_wr (struct enetc_mdio_priv *mdio_priv,int off, +u32 val) {enetc_port_wr_mdio (mdio_priv->hw, mdio_priv->mdio_base + off, val); } -#define enetc_mdio_rd (mdio_priv, off) \ - _enetc_mdio_rd(mdio_priv, ENETC_##off) -#define enetc_mdio_wr (mdio_priv, off, val) \ - _enetc_mdio_wr(mdio_priv, ENETC_##off, val)#define enetc_mdio_rd_reg (off) enetc_mdio_rd(mdio_priv, off)#define MDIO_CFG_CLKDIV (x) ((((x) >> 1) & 0xff) << 8)
@@ -54,7 +50,7 @@ static int enetc_mdio_wait_complete(struct enetc_mdio_priv *mdio_priv) {u32 val; -return readx_poll_timeout (enetc_mdio_rd_reg,MDIO_CFG , val, +return readx_poll_timeout (enetc_mdio_rd_reg,ENETC_MDIO_CFG , val, !(val &MDIO_CFG_BSY ),10 ,10 *TIMEOUT ); }
@@ -75,7 +71,7 @@ int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value) mdio_cfg &= ~MDIO_CFG_ENC45 ; } -enetc_mdio_wr (mdio_priv,MDIO_CFG , mdio_cfg); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_CFG , mdio_cfg); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
@@ -83,11 +79,11 @@ int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value)/* set port and dev addr */ mdio_ctl =MDIO_CTL_PORT_ADDR (phy_id) |MDIO_CTL_DEV_ADDR (dev_addr); -enetc_mdio_wr (mdio_priv,MDIO_CTL , mdio_ctl); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_CTL , mdio_ctl);/* set the register address */ if (regnum &MII_ADDR_C45 ) { -enetc_mdio_wr (mdio_priv,MDIO_ADDR , regnum &0xffff ); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_ADDR , regnum &0xffff ); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
@@ -95,7 +91,7 @@ int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value) }/* write the value */ -enetc_mdio_wr (mdio_priv,MDIO_DATA ,MDIO_DATA (value)); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_DATA ,MDIO_DATA (value)); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
@@ -121,7 +117,7 @@ int enetc_mdio_read(struct mii_bus *bus, int phy_id, int regnum) mdio_cfg &= ~MDIO_CFG_ENC45 ; } -enetc_mdio_wr (mdio_priv,MDIO_CFG , mdio_cfg); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_CFG , mdio_cfg); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
@@ -129,11 +125,11 @@ int enetc_mdio_read(struct mii_bus *bus, int phy_id, int regnum)/* set port and device addr */ mdio_ctl =MDIO_CTL_PORT_ADDR (phy_id) |MDIO_CTL_DEV_ADDR (dev_addr); -enetc_mdio_wr (mdio_priv,MDIO_CTL , mdio_ctl); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_CTL , mdio_ctl);/* set the register address */ if (regnum &MII_ADDR_C45 ) { -enetc_mdio_wr (mdio_priv,MDIO_ADDR , regnum &0xffff ); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_ADDR , regnum &0xffff ); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
@@ -141,21 +137,21 @@ int enetc_mdio_read(struct mii_bus *bus, int phy_id, int regnum) }/* initiate the read */ -enetc_mdio_wr (mdio_priv,MDIO_CTL , mdio_ctl |MDIO_CTL_READ ); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_CTL , mdio_ctl |MDIO_CTL_READ ); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)return ret;/* return all Fs if nothing was there */ -if (enetc_mdio_rd (mdio_priv,MDIO_CFG ) &MDIO_CFG_RD_ER ) { +if (enetc_mdio_rd (mdio_priv,ENETC_MDIO_CFG ) &MDIO_CFG_RD_ER ) {dev_dbg (&bus->dev,"Error while reading PHY%d reg at %d.%hhu\n" , phy_id, dev_addr, regnum);return 0xffff ; } - value =enetc_mdio_rd (mdio_priv,MDIO_DATA ) &0xffff ; + value =enetc_mdio_rd (mdio_priv,ENETC_MDIO_DATA ) &0xffff ;return value; }
Signature · 1 line
2.20.1
PATCH RESEND 2/4 enetc: don't use macro magic for the readx_poll_timeout() callback
In reply to Michael WalleThe macro enetc_mdio_rd_reg() is just used in that particular case and has a hardcoded parameter name "mdio_priv". Define a specific function to use for readx_poll_timeout() instead. Also drop the TIMEOUT macro since it is used just once.
--- drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_mdio.c +8 -6
@@ -25,8 +25,6 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,enetc_port_wr_mdio (mdio_priv->hw, mdio_priv->mdio_base + off, val); } -#define enetc_mdio_rd_reg (off) enetc_mdio_rd(mdio_priv, off) -#define MDIO_CFG_CLKDIV (x) ((((x) >> 1) & 0xff) << 8)#define MDIO_CFG_BSY BIT(0)#define MDIO_CFG_RD_ER BIT(1)
@@ -45,13 +43,17 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,#define MDIO_CTL_READ BIT(15)#define MDIO_DATA (x) ((x) & 0xffff) -#define TIMEOUT 1000 +static bool enetc_mdio_is_busy (struct enetc_mdio_priv *mdio_priv) +{ +return enetc_mdio_rd (mdio_priv,ENETC_MDIO_CFG ) &MDIO_CFG_BSY ; +} +static int enetc_mdio_wait_complete (struct enetc_mdio_priv *mdio_priv) { -u32 val; +bool is_busy; -return readx_poll_timeout (enetc_mdio_rd_reg,ENETC_MDIO_CFG , val, - !(val &MDIO_CFG_BSY ),10 ,10 *TIMEOUT ); +return readx_poll_timeout (enetc_mdio_is_busy, mdio_priv, + is_busy, !is_busy,10 ,10 *1000 ); }int enetc_mdio_write (struct mii_bus *bus,int phy_id,int regnum,u16 value)
Signature · 1 line
2.20.1
PATCH RESEND 3/4 enetc: drop MDIO_DATA() macro
In reply to Michael Wallevalue is u16, masking with 0xffff is a nop. Drop it.
--- drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_mdio.c +1 -2
@@ -41,7 +41,6 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,#define MDIO_CTL_DEV_ADDR (x) ((x) & 0x1f)#define MDIO_CTL_PORT_ADDR (x) (((x) & 0x1f) << 5)#define MDIO_CTL_READ BIT(15) -#define MDIO_DATA (x) ((x) & 0xffff)static bool enetc_mdio_is_busy (struct enetc_mdio_priv *mdio_priv) {
@@ -93,7 +92,7 @@ int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value) }/* write the value */ -enetc_mdio_wr (mdio_priv,ENETC_MDIO_DATA ,MDIO_DATA (value)); +enetc_mdio_wr (mdio_priv,ENETC_MDIO_DATA , value); ret =enetc_mdio_wait_complete (mdio_priv);if (ret)
Signature · 1 line
2.20.1
PATCH RESEND 4/4 enetc: reorder macros and functions
In reply to Michael WalleNow that there aren't any more macros with parameters, move the macros above any functions.
--- .../net/ethernet/freescale/enetc/enetc_mdio.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_mdio.c +11 -11
@@ -14,17 +14,6 @@#define ENETC_MDIO_DATA 0x8/* MDIO data */ #define ENETC_MDIO_ADDR 0xc/* MDIO address */ -static inline u32 enetc_mdio_rd (struct enetc_mdio_priv *mdio_priv,int off) -{ -return enetc_port_rd_mdio (mdio_priv->hw, mdio_priv->mdio_base + off); -} - -static inline void enetc_mdio_wr (struct enetc_mdio_priv *mdio_priv,int off, -u32 val) -{ -enetc_port_wr_mdio (mdio_priv->hw, mdio_priv->mdio_base + off, val); -} -#define MDIO_CFG_CLKDIV (x) ((((x) >> 1) & 0xff) << 8)#define MDIO_CFG_BSY BIT(0)#define MDIO_CFG_RD_ER BIT(1)
@@ -42,6 +31,17 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,#define MDIO_CTL_PORT_ADDR (x) (((x) & 0x1f) << 5)#define MDIO_CTL_READ BIT(15) +static inline u32 enetc_mdio_rd (struct enetc_mdio_priv *mdio_priv,int off) +{ +return enetc_port_rd_mdio (mdio_priv->hw, mdio_priv->mdio_base + off); +} + +static inline void enetc_mdio_wr (struct enetc_mdio_priv *mdio_priv,int off, +u32 val) +{ +enetc_port_wr_mdio (mdio_priv->hw, mdio_priv->mdio_base + off, val); +} +static bool enetc_mdio_is_busy (struct enetc_mdio_priv *mdio_priv) {return enetc_mdio_rd (mdio_priv,ENETC_MDIO_CFG ) &MDIO_CFG_BSY ;
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Michael Walle <[email protected]>
Date: Mon, 28 Dec 2020 14:00:30 +0100
Quoted 2 lines
This are some code cleanups in the MDIO part of the enetc. They are intended to make the code more readable.
Series applied, thank you.