Commit 90ce665c authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8928e19a

drivers/net/phy/bcm87xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE