From e17c408b19a57736d4cc3d5bf6f0a2b61b6f3005 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 6 Mar 2020 15:03:30 +0100 Subject: net: mdiobus: Add slice By adding a slice to the mdio bus we make the mdio code safe for being called in a poller. Signed-off-by: Sascha Hauer --- include/linux/phy.h | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'include/linux') diff --git a/include/linux/phy.h b/include/linux/phy.h index eec1332c9d..cdcb7c24f2 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -16,6 +16,7 @@ #define __PHY_H #include +#include #include #include #include @@ -116,9 +117,16 @@ struct mii_bus { struct list_head list; bool is_multiplexed; + + struct slice slice; }; #define to_mii_bus(d) container_of(d, struct mii_bus, dev) +static inline struct slice *mdiobus_slice(struct mii_bus *bus) +{ + return &bus->slice; +} + int mdiobus_register(struct mii_bus *bus); void mdiobus_unregister(struct mii_bus *bus); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); @@ -134,28 +142,8 @@ struct mii_bus *mdiobus_get_bus(int busnum); struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np); -/** - * mdiobus_read - Convenience function for reading a given MII mgmt register - * @bus: the mii_bus struct - * @addr: the phy address - * @regnum: register number to read - */ -static inline int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum) -{ - return bus->read(bus, addr, regnum); -} - -/** - * mdiobus_write - Convenience function for writing a given MII mgmt register - * @bus: the mii_bus struct - * @addr: the phy address - * @regnum: register number to write - * @val: value to write to @regnum - */ -static inline int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val) -{ - return bus->write(bus, addr, regnum, val); -} +int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum); +int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val); /* phy_device: An instance of a PHY * @@ -397,11 +385,15 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, int phy_register_fixup_for_id(const char *bus_id, int (*run)(struct phy_device *)); int phy_scan_fixups(struct phy_device *phydev); - int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad); void phy_write_mmd_indirect(struct phy_device *phydev, int prtad, int devad, u16 data); +static inline bool phy_acquired(struct phy_device *phydev) +{ + return phydev && phydev->bus && slice_acquired(&phydev->bus->slice); +} + #ifdef CONFIG_PHYLIB int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, int (*run)(struct phy_device *)); -- cgit v1.2.3