Commit bec170e5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: add helpers phy_(un)lock_mdio_bus 



Add helpers to make locking/unlocking the MDIO bus easier.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4eb47198

drivers/net/phy/phy-core.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -419,9 +419,9 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_read_mmd(phydev, devad, regnum);

	ret = __phy_read_mmd(phydev, devad, regnum);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -480,9 +480,9 @@ int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_write_mmd(phydev, devad, regnum, val);

	ret = __phy_write_mmd(phydev, devad, regnum, val);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -536,9 +536,9 @@ int phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_modify_changed(phydev, regnum, mask, set);

	ret = __phy_modify_changed(phydev, regnum, mask, set);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -580,9 +580,9 @@ int phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_modify(phydev, regnum, mask, set);

	ret = __phy_modify(phydev, regnum, mask, set);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -639,9 +639,9 @@ int phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_modify_mmd_changed(phydev, devad, regnum, mask, set);

	ret = __phy_modify_mmd_changed(phydev, devad, regnum, mask, set);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -687,9 +687,9 @@ int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, 
{

{

	int ret;

	int ret;





	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	ret = __phy_modify_mmd(phydev, devad, regnum, mask, set);

	ret = __phy_modify_mmd(phydev, devad, regnum, mask, set);

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}
@@ -721,7 +721,7 @@ static int __phy_write_page(struct phy_device *phydev, int page) 
 */

 */

int phy_save_page(struct phy_device *phydev)

int phy_save_page(struct phy_device *phydev)

{

{

	mutex_lock(&phydev->mdio.bus->mdio_lock);

	phy_lock_mdio_bus(phydev);

	return __phy_read_page(phydev);

	return __phy_read_page(phydev);

}

}

EXPORT_SYMBOL_GPL(phy_save_page);

EXPORT_SYMBOL_GPL(phy_save_page);
@@ -788,7 +788,7 @@ int phy_restore_page(struct phy_device *phydev, int oldpage, int ret) 
		ret = oldpage;

		ret = oldpage;

	}

	}





	mutex_unlock(&phydev->mdio.bus->mdio_lock);

	phy_unlock_mdio_bus(phydev);





	return ret;

	return ret;

}

}

include/linux/phy.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -1076,6 +1076,16 @@ static inline const char *phydev_name(const struct phy_device *phydev) 
	return dev_name(&phydev->mdio.dev);

	return dev_name(&phydev->mdio.dev);

}

}





static inline void phy_lock_mdio_bus(struct phy_device *phydev)

{

	mutex_lock(&phydev->mdio.bus->mdio_lock);

}



static inline void phy_unlock_mdio_bus(struct phy_device *phydev)

{

	mutex_unlock(&phydev->mdio.bus->mdio_lock);

}



void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)

void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)

	__printf(2, 3);

	__printf(2, 3);

void phy_attached_info(struct phy_device *phydev);

void phy_attached_info(struct phy_device *phydev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE