nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: dsa: vsc73xx: use defined values in phy operations

Browse source 
This commit changes magic numbers in phy operations.
Some shifted registers was replaced with bitfield macros.

No functional changes done.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pawel Dembicki 2024-08-05 23:23:22 +02:00 committed by David S. Miller
parent eb3ab13d99
commit 2524d6c28b
1 changed files with 33 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/net/dsa/vitesse-vsc73xx-core.c
View file

@ -21,6 +21,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/bitfield.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
@ -42,6 +43,7 @@
/* MII Block subblock */ /* 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 */ #define CPU_PORT 6 /* CPU port */
@ -229,6 +231,19 @@
#define VSC73XX_MII_DATA 0x2 #define VSC73XX_MII_DATA 0x2
#define VSC73XX_MII_MPRES 0x3 #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_NOPREAMBLE BIT(6)
#define VSC73XX_MII_MPRES_PRESCALEVAL GENMASK(5, 0) #define VSC73XX_MII_MPRES_PRESCALEVAL GENMASK(5, 0)
#define VSC73XX_MII_PRESCALEVAL_MIN 3 /* min allowed mdio clock prescaler */ #define VSC73XX_MII_PRESCALEVAL_MIN 3 /* min allowed mdio clock prescaler */
@ -543,20 +558,24 @@ static int vsc73xx_phy_read(struct dsa_switch *ds, int phy, int regnum)
int ret; int ret;
/* Setting bit 26 means "read" */ /* Setting bit 26 means "read" */
cmd = BIT(26) | (phy << 21) | (regnum << 16); cmd = VSC73XX_MII_CMD_OPERATION |
ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, 0, 1, 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) if (ret)
return ret; return ret;
msleep(2); 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) if (ret)
return 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", dev_err(vsc->dev, "reading reg %02x from phy%d failed\n",
regnum, phy); regnum, phy);
return -EIO; return -EIO;
} }
val &= 0xFFFFU; val &= VSC73XX_MII_DATA_READ_DATA;
dev_dbg(vsc->dev, "read reg %02x from phy%d = %04x\n", dev_dbg(vsc->dev, "read reg %02x from phy%d = %04x\n",
regnum, phy, val); regnum, phy, val);
@ -582,8 +601,10 @@ static int vsc73xx_phy_write(struct dsa_switch *ds, int phy, int regnum,
return 0; return 0;
} }
cmd = (phy << 21) | (regnum << 16); cmd = FIELD_PREP(VSC73XX_MII_CMD_PHY_ADDR, phy) |
ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, 0, 1, cmd); 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) if (ret)
return ret; return ret;