net: dsa: vsc73xx: use defined values in phy operations
Subsystems (3)
PATCH 1/1 net: dsa: vsc73xx: use defined values in phy operations
This commit changes magic numbers in phy operations. Some shifted registers was replaced with bitfield macros.
No functional changes done.
Reviewed-by Linus Walleij <[email protected]>
Reviewed-by Florian Fainelli <[email protected]>
Signed-off-by Pawel Dembicki <[email protected]>
---
This patch came from net series[0].
Changes since net:
- rebased to net-next/main only
[0] https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
--- drivers/net/dsa/vitesse-vsc73xx-core.c | 45 +++++++++++++++++++------- 1 file changed, 33 insertions(+), 12 deletions(-)
drivers/net/dsa/vitesse-vsc73xx-core.c +33 -12
@@ -21,6 +21,7 @@#include <linux/of.h> #include <linux/of_mdio.h> #include <linux/bitops.h> +#include <linux/bitfield.h> #include <linux/if_bridge.h> #include <linux/if_vlan.h> #include <linux/etherdevice.h>
@@ -41,7 +42,8 @@#define VSC73XX_BLOCK_SYSTEM 0x7/* Only subblock 0 */ /* MII Block subblock */ -#define VSC73XX_BLOCK_MII_INTERNAL 0x0/* Internal MDIO subblock */ +#define VSC73XX_BLOCK_MII_INTERNAL 0x0/* Internal MDIO subblock */ +#define VSC73XX_BLOCK_MII_EXTERNAL 0x1/* External MDIO subblock */ #define CPU_PORT 6/* CPU port */
@@ -224,10 +226,23 @@#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE 3/* MII block 3 registers */ -#define VSC73XX_MII_STAT 0x0 -#define VSC73XX_MII_CMD 0x1 -#define VSC73XX_MII_DATA 0x2 -#define VSC73XX_MII_MPRES 0x3 +#define VSC73XX_MII_STAT 0x0 +#define VSC73XX_MII_CMD 0x1 +#define VSC73XX_MII_DATA 0x2 +#define VSC73XX_MII_MPRES 0x3 + +#define VSC73XX_MII_STAT_BUSY BIT(3) +#define VSC73XX_MII_STAT_READ BIT(2) +#define VSC73XX_MII_STAT_WRITE BIT(1) + +#define VSC73XX_MII_CMD_SCAN BIT(27) +#define VSC73XX_MII_CMD_OPERATION BIT(26) +#define VSC73XX_MII_CMD_PHY_ADDR GENMASK(25, 21) +#define VSC73XX_MII_CMD_PHY_REG GENMASK(20, 16) +#define VSC73XX_MII_CMD_WRITE_DATA GENMASK(15, 0) + +#define VSC73XX_MII_DATA_FAILURE BIT(16) +#define VSC73XX_MII_DATA_READ_DATA GENMASK(15, 0)#define VSC73XX_MII_MPRES_NOPREAMBLE BIT(6)#define VSC73XX_MII_MPRES_PRESCALEVAL GENMASK(5, 0)
@@ -543,20 +558,24 @@ static int vsc73xx_phy_read(struct dsa_switch *ds, int phy, int regnum)int ret;/* Setting bit 26 means "read" */ - cmd =BIT (26 ) | (phy <<21 ) | (regnum <<16 ); - ret =vsc73xx_write (vsc,VSC73XX_BLOCK_MII ,0 ,1 , cmd); + cmd =VSC73XX_MII_CMD_OPERATION | +FIELD_PREP (VSC73XX_MII_CMD_PHY_ADDR , phy) | +FIELD_PREP (VSC73XX_MII_CMD_PHY_REG , regnum); + ret =vsc73xx_write (vsc,VSC73XX_BLOCK_MII ,VSC73XX_BLOCK_MII_INTERNAL , +VSC73XX_MII_CMD , cmd);if (ret)return ret;msleep (2 ); - ret =vsc73xx_read (vsc,VSC73XX_BLOCK_MII ,0 ,2 , &val); + ret =vsc73xx_read (vsc,VSC73XX_BLOCK_MII ,VSC73XX_BLOCK_MII_INTERNAL , +VSC73XX_MII_DATA , &val);if (ret)return ret; -if (val &BIT (16 )) { +if (val &VSC73XX_MII_DATA_FAILURE ) {dev_err (vsc->dev,"reading reg %02x from phy%d failed\n" , regnum, phy);return -EIO ; } - val &=0xFFFFU ; + val &=VSC73XX_MII_DATA_READ_DATA ;dev_dbg (vsc->dev,"read reg %02x from phy%d = %04x\n" , regnum, phy, val);
@@ -582,8 +601,10 @@ static int vsc73xx_phy_write(struct dsa_switch *ds, int phy, int regnum,return 0 ; } - cmd = (phy <<21 ) | (regnum <<16 ); - ret =vsc73xx_write (vsc,VSC73XX_BLOCK_MII ,0 ,1 , cmd); + cmd =FIELD_PREP (VSC73XX_MII_CMD_PHY_ADDR , phy) | +FIELD_PREP (VSC73XX_MII_CMD_PHY_REG , regnum); + ret =vsc73xx_write (vsc,VSC73XX_BLOCK_MII ,VSC73XX_BLOCK_MII_INTERNAL , +VSC73XX_MII_CMD , cmd);if (ret)return ret;
Signature · 1 line
2.34.1
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 10 lines · On Mon, 5 Aug 2024 23:23:22 +0200 you wrote:
This commit changes magic numbers in phy operations. Some shifted registers was replaced with bitfield macros.
No functional changes done.
Reviewed-by Linus Walleij <[email protected]>Reviewed-by Florian Fainelli <[email protected]>Signed-off-by Pawel Dembicki <[email protected]>[...]
Here is the summary with links:
- [net-next] net: dsa: vsc73xx: use defined values in phy operations
https://git.kernel.org/netdev/net-next/c/2524d6c28bdc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html