net: mdiobus: add clause 45 mdiobus accessors
Subsystems (5)
PATCH 1/1 net: mdiobus: add clause 45 mdiobus accessors
There is a recurring pattern throughout some of the PHY code converting a devad and regnum to our packed clause 45 representation. Rather than having this scattered around the code, let's put a common translation function in mdio.h, and provide some register accessors.
Convert the phylib core, phylink, bcm87xx and cortina to use these.
--- drivers/net/phy/bcm87xx.c | 2 +- drivers/net/phy/cortina.c | 3 +-- drivers/net/phy/phy-core.c | 11 ++++------- drivers/net/phy/phy.c | 4 ++-- drivers/net/phy/phy_device.c | 20 ++++++++------------ drivers/net/phy/phylink.c | 11 +++++------ include/linux/mdio.h | 31 +++++++++++++++++++++++++++++++ include/linux/phy.h | 6 ------ 8 files changed, 52 insertions(+), 36 deletions(-)
drivers/net/phy/bcm87xx.c +1 -1
@@ -55,7 +55,7 @@ static int bcm87xx_of_reg_init(struct phy_device *phydev)u16 mask =be32_to_cpup (paddr++);u16 val_bits =be32_to_cpup (paddr++);int val; -u32 regnum =MII_ADDR_C45 | (devid <<16 ) | reg; +u32 regnum =mdiobus_c45_addr (devid, reg); val =0 ;if (mask) { val =phy_read (phydev, regnum);
drivers/net/phy/cortina.c +1 -2
@@ -17,8 +17,7 @@static int cortina_read_reg (struct phy_device *phydev,u16 regnum) { -return mdiobus_read (phydev->mdio.bus, phydev->mdio.addr, -MII_ADDR_C45 | regnum); +return mdiobus_c45_read (phydev->mdio.bus, phydev->mdio.addr,0 , regnum); }static int cortina_read_status (struct phy_device *phydev)
drivers/net/phy/phy-core.c +4 -7
@@ -428,9 +428,8 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)if (phydev->drv && phydev->drv->read_mmd) { val = phydev->drv->read_mmd (phydev, devad, regnum); }else if (phydev->is_c45) { -u32 addr =MII_ADDR_C45 | (devad <<16 ) | (regnum &0xffff ); - - val =__mdiobus_read (phydev->mdio.bus, phydev->mdio.addr, addr); + val =__mdiobus_c45_read (phydev->mdio.bus, phydev->mdio.addr, + devad, regnum); }else {struct mii_bus *bus = phydev->mdio.bus;int phy_addr = phydev->mdio.addr;
@@ -485,10 +484,8 @@ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)if (phydev->drv && phydev->drv->write_mmd) { ret = phydev->drv->write_mmd (phydev, devad, regnum, val); }else if (phydev->is_c45) { -u32 addr =MII_ADDR_C45 | (devad <<16 ) | (regnum &0xffff ); - - ret =__mdiobus_write (phydev->mdio.bus, phydev->mdio.addr, - addr, val); + ret =__mdiobus_c45_write (phydev->mdio.bus, phydev->mdio.addr, + devad, regnum, val); }else {struct mii_bus *bus = phydev->mdio.bus;int phy_addr = phydev->mdio.addr;
drivers/net/phy/phy.c +2 -2
@@ -361,7 +361,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)if (mdio_phy_id_is_c45 (mii_data->phy_id)) { prtad =mdio_phy_id_prtad (mii_data->phy_id); devad =mdio_phy_id_devad (mii_data->phy_id); - devad =MII_ADDR_C45 | devad <<16 | mii_data->reg_num; + devad =mdiobus_c45_addr (devad, mii_data->reg_num); }else { prtad = mii_data->phy_id; devad = mii_data->reg_num;
@@ -374,7 +374,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)if (mdio_phy_id_is_c45 (mii_data->phy_id)) { prtad =mdio_phy_id_prtad (mii_data->phy_id); devad =mdio_phy_id_devad (mii_data->phy_id); - devad =MII_ADDR_C45 | devad <<16 | mii_data->reg_num; + devad =mdiobus_c45_addr (devad, mii_data->reg_num); }else { prtad = mii_data->phy_id; devad = mii_data->reg_num;
drivers/net/phy/phy_device.c +8 -12
@@ -675,16 +675,14 @@ EXPORT_SYMBOL(phy_device_create);static int get_phy_c45_devs_in_pkg (struct mii_bus *bus,int addr,int dev_addr,u32 *devices_in_package) { -int phy_reg, reg_addr; +int phy_reg; - reg_addr =MII_ADDR_C45 | dev_addr <<16 |MDIO_DEVS2 ; - phy_reg =mdiobus_read (bus, addr, reg_addr); + phy_reg =mdiobus_c45_read (bus, addr, dev_addr,MDIO_DEVS2 );if (phy_reg <0 )return -EIO ; *devices_in_package = phy_reg <<16 ; - reg_addr =MII_ADDR_C45 | dev_addr <<16 |MDIO_DEVS1 ; - phy_reg =mdiobus_read (bus, addr, reg_addr); + phy_reg =mdiobus_c45_read (bus, addr, dev_addr,MDIO_DEVS1 );if (phy_reg <0 )return -EIO ; *devices_in_package |= phy_reg;
@@ -709,11 +707,11 @@ static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr,* */ static int get_phy_c45_ids (struct mii_bus *bus,int addr,u32 *phy_id, -struct phy_c45_device_ids *c45_ids) { -int phy_reg; -int i, reg_addr; +struct phy_c45_device_ids *c45_ids) +{const int num_ids =ARRAY_SIZE (c45_ids->device_ids);u32 *devs = &c45_ids->devices_in_package; +int i, phy_reg;/* Find first non-zero Devices In package. Device zero is reserved * for 802.3 c45 complied PHYs, so don't probe it at first.
@@ -747,14 +745,12 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,if (!(c45_ids->devices_in_package & (1 << i)))continue ; - reg_addr =MII_ADDR_C45 | i <<16 |MII_PHYSID1 ; - phy_reg =mdiobus_read (bus, addr, reg_addr); + phy_reg =mdiobus_c45_read (bus, addr, i,MII_PHYSID1 );if (phy_reg <0 )return -EIO ; c45_ids->device_ids[i] = phy_reg <<16 ; - reg_addr =MII_ADDR_C45 | i <<16 |MII_PHYSID2 ; - phy_reg =mdiobus_read (bus, addr, reg_addr); + phy_reg =mdiobus_c45_read (bus, addr, i,MII_PHYSID2 );if (phy_reg <0 )return -EIO ; c45_ids->device_ids[i] |= phy_reg;
drivers/net/phy/phylink.c +5 -6
@@ -1631,7 +1631,7 @@ static int phylink_phy_read(struct phylink *pl, unsigned int phy_id,if (mdio_phy_id_is_c45 (phy_id)) { prtad =mdio_phy_id_prtad (phy_id); devad =mdio_phy_id_devad (phy_id); - devad =MII_ADDR_C45 | devad <<16 | reg; + devad =mdiobus_c45_addr (devad, reg); }else if (phydev->is_c45) {switch (reg) {case MII_BMCR :
@@ -1654,7 +1654,7 @@ static int phylink_phy_read(struct phylink *pl, unsigned int phy_id,return -EINVAL ; } prtad = phy_id; - devad =MII_ADDR_C45 | devad <<16 | reg; + devad =mdiobus_c45_addr (devad, reg); }else { prtad = phy_id; devad = reg;
@@ -1671,7 +1671,7 @@ static int phylink_phy_write(struct phylink *pl, unsigned int phy_id,if (mdio_phy_id_is_c45 (phy_id)) { prtad =mdio_phy_id_prtad (phy_id); devad =mdio_phy_id_devad (phy_id); - devad =MII_ADDR_C45 | devad <<16 | reg; + devad =mdiobus_c45_addr (devad, reg); }else if (phydev->is_c45) {switch (reg) {case MII_BMCR :
@@ -1694,7 +1694,7 @@ static int phylink_phy_write(struct phylink *pl, unsigned int phy_id,return -EINVAL ; } prtad = phy_id; - devad =MII_ADDR_C45 | devad <<16 | reg; + devad =mdiobus_c45_addr (devad, reg); }else { prtad = phy_id; devad = reg;
@@ -2292,7 +2292,6 @@ void phylink_mii_c22_pcs_an_restart(struct mdio_device *pcs) }EXPORT_SYMBOL_GPL (phylink_mii_c22_pcs_an_restart); -#define C45_ADDR (d,a) (MII_ADDR_C45 | (d) << 16 | (a))void phylink_mii_c45_pcs_get_state (struct mdio_device *pcs,struct phylink_link_state *state) {
@@ -2300,7 +2299,7 @@ void phylink_mii_c45_pcs_get_state(struct mdio_device *pcs,int addr = pcs->addr;int stat; - stat =mdiobus_read (bus, addr,C45_ADDR (MDIO_MMD_PCS ,MDIO_STAT1 )); + stat =mdiobus_c45_read (bus, addr,MDIO_MMD_PCS ,MDIO_STAT1 );if (stat <0 ) { state->link = false;return ;
include/linux/mdio.h +31 -0
@@ -9,6 +9,13 @@#include <uapi/linux/mdio.h> #include <linux/mod_devicetable.h> +/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit +* IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. +*/ +#define MII_ADDR_C45 (1<<30) +#define MII_DEVADDR_C45_SHIFT 16 +#define MII_REGADDR_C45_MASK GENMASK(15, 0) +struct gpio_desc ;struct mii_bus ;
@@ -326,6 +333,30 @@ int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val);int mdiobus_modify (struct mii_bus *bus,int addr,u32 regnum,u16 mask,u16 set); +static inline u32 mdiobus_c45_addr (int devad,u16 regnum) +{ +return MII_ADDR_C45 | devad <<MII_DEVADDR_C45_SHIFT | regnum; +} + +static inline int __mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad, +u16 regnum) +{ +return __mdiobus_read (bus, prtad,mdiobus_c45_addr (devad, regnum)); +} + +static inline int __mdiobus_c45_write (struct mii_bus *bus,int prtad,int devad, +u16 regnum,u16 val) +{ +return __mdiobus_write (bus, prtad,mdiobus_c45_addr (devad, regnum), + val); +} + +static inline int mdiobus_c45_read (struct mii_bus *bus,int prtad,int devad, +u16 regnum) +{ +return mdiobus_read (bus, prtad,mdiobus_c45_addr (devad, regnum)); +} +int mdiobus_register_device (struct mdio_device *mdiodev);int mdiobus_unregister_device (struct mdio_device *mdiodev);bool mdiobus_is_registered_device (struct mii_bus *bus,int addr);
include/linux/phy.h +0 -6
@@ -209,12 +209,6 @@ static inline const char *phy_modes(phy_interface_t interface)#define MII_BUS_ID_SIZE 61 -/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit -IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */ -#define MII_ADDR_C45 (1<<30) -#define MII_DEVADDR_C45_SHIFT 16 -#define MII_REGADDR_C45_MASK GENMASK(15, 0) -struct device ;struct phylink ;struct sfp_bus ;
Signature · 1 line
2.20.1
Quoted 8 lines · Russell King
There is a recurring pattern throughout some of the PHY code converting a devad and regnum to our packed clause 45 representation. Rather than having this scattered around the code, let's put a common translation function in
mdio.h, and provide some register accessors.Convert the phylib core, phylink, bcm87xx and cortina to use these.
Signed-off-by Russell King <[email protected]>
Andrew
Quoted 9 lines · Russell King
There is a recurring pattern throughout some of the PHY code converting a devad and regnum to our packed clause 45 representation. Rather than having this scattered around the code, let's put a common translation function in
mdio.h, and provide some register accessors.Convert the phylib core, phylink, bcm87xx and cortina to use these.
Signed-off-by Russell King <[email protected]>---
[snip]
drivers/net/phy/phy-core.c int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
Quoted 3 lines
drivers/net/phy/phy-core.c +0
-0@@ -428,9 +428,8 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
This should probably be changed to use u16 regnum in a separate patch.
drivers/net/phy/phy-core.c int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
Quoted 12 lines
drivers/net/phy/phy-core.c +2
-3if (phydev->drv && phydev->drv->read_mmd) { val = phydev->drv->read_mmd (phydev, devad, regnum); }else if (phydev->is_c45) { -u32 addr =MII_ADDR_C45 | (devad <<16 ) | (regnum &0xffff ); - - val =__mdiobus_read (phydev->mdio.bus, phydev->mdio.addr, addr); + val =__mdiobus_c45_read (phydev->mdio.bus, phydev->mdio.addr, + devad, regnum); }else {struct mii_bus *bus = phydev->mdio.bus;int phy_addr = phydev->mdio.addr;@@ -485,10 +484,8 @@ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
and likewise.
Signature · 1 line
Florian
From: Russell King <[email protected]>
Date: Tue, 26 May 2020 16:29:36 +0100
Quoted 8 lines
There is a recurring pattern throughout some of the PHY code converting a devad and regnum to our packed clause 45 representation. Rather than having this scattered around the code, let's put a common translation function in
mdio.h, and provide some register accessors.Convert the phylib core, phylink, bcm87xx and cortina to use these.
Signed-off-by Russell King <[email protected]>
Applied, thank you.