net: phy: Add phy_modify() accessor

Add read-modify-write unlocked accessor for accessing a PHY register.

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e61c9b8a178452bdfffb8bc36cf438593d5c15c9..50448cf62c4f20c53f181b3dfc93da3be58ae4ec 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1110,3 +1110,23 @@ int phy_get_interface_by_name(const char *str)
 
        return -1;
 }
+
+/**
+ * phy_modify - Convenience function for modifying a given PHY register
+ * @phydev: the phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: register number to write
+ * @mask: bit mask of bits to clear
+ * @set: new value of bits set in mask to write to @regnum
+ */
+int phy_modify(struct phy_device *phydev, int devad, int regnum, u16 mask,
+              u16 set)
+{
+       int ret;
+
+       ret = phy_read(phydev, devad, regnum);
+       if (ret < 0)
+               return ret;
+
+       return phy_write(phydev, devad, regnum, (ret & ~mask) | set);
+}

diff --git a/include/phy.h b/include/phy.h
index 807c2932fda10de83c06ac16983790a8e6d06001..1a30aee5421ae462bf2985920be00bafc00d1ea0 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -526,6 +526,8 @@ int phy_config(struct phy_device *phydev);
 int phy_shutdown(struct phy_device *phydev);
 int phy_register(struct phy_driver *drv);
 int phy_set_supported(struct phy_device *phydev, u32 max_speed);
+int phy_modify(struct phy_device *phydev, int devad, int regnum, u16 mask,
+              u16 set);
 int genphy_config_aneg(struct phy_device *phydev);
 int genphy_restart_aneg(struct phy_device *phydev);
 int genphy_update_link(struct phy_device *phydev);