| Message ID | 20080929023748.GG21560@xi.wantstofly.org |
|---|---|
| State | Superseded, archived |
| Delegated to: | Jeff Garzik |
| Headers | show |
On Mon, 29 Sep 2008, Lennert Buytenhek wrote: > Add mdiobus_{read,write} routines to allow direct reading/writing > of registers on an mii bus without having to go through the PHY > abstraction, and make phy_{read,write} use these primitives. > > int phy_read(struct phy_device *phydev, u16 regnum) > { > - int retval; > - struct mii_bus *bus = phydev->bus; > - > - BUG_ON(in_interrupt()); > - > - mutex_lock(&bus->mdio_lock); > - retval = bus->read(bus, phydev->addr, regnum); > - mutex_unlock(&bus->mdio_lock); > - > - return retval; > + return mdiobus_read(phydev->bus, phydev->addr, regnum); > } > EXPORT_SYMBOL(phy_read); Might want to make these function static inline. Since they are external, gcc won't be able to inline them automatically. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Sep 29, 2008 at 01:27:11PM -0700, Trent Piepho wrote: > > Add mdiobus_{read,write} routines to allow direct reading/writing > > of registers on an mii bus without having to go through the PHY > > abstraction, and make phy_{read,write} use these primitives. > > > > int phy_read(struct phy_device *phydev, u16 regnum) > > { > > - int retval; > > - struct mii_bus *bus = phydev->bus; > > - > > - BUG_ON(in_interrupt()); > > - > > - mutex_lock(&bus->mdio_lock); > > - retval = bus->read(bus, phydev->addr, regnum); > > - mutex_unlock(&bus->mdio_lock); > > - > > - return retval; > > + return mdiobus_read(phydev->bus, phydev->addr, regnum); > > } > > EXPORT_SYMBOL(phy_read); > > Might want to make these function static inline. Since they are > external, gcc won't be able to inline them automatically. If i make them static inline, I won't be able to call them from external code, which was sort of the idea. Or are you suggesting that I move them to include/linux/phy.h ? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sep 28, 2008, at 21:37, Lennert Buytenhek wrote: > Add mdiobus_{read,write} routines to allow direct reading/writing > of registers on an mii bus without having to go through the PHY > abstraction, and make phy_{read,write} use these primitives. > > Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Looks pretty good. I was actually just thinking this might be handy for some code we're working on. Just one comment... > > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -68,16 +68,7 @@ EXPORT_SYMBOL(phy_print_status); > */ > int phy_read(struct phy_device *phydev, u16 regnum) > { > - int retval; > - struct mii_bus *bus = phydev->bus; > - > - BUG_ON(in_interrupt()); > - > - mutex_lock(&bus->mdio_lock); > - retval = bus->read(bus, phydev->addr, regnum); > - mutex_unlock(&bus->mdio_lock); > - > - return retval; > + return mdiobus_read(phydev->bus, phydev->addr, regnum); > } > EXPORT_SYMBOL(phy_read); I agree with Trent. Move these into phy.h and make them static inline -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index f9c27ac..0db3605 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -210,6 +210,55 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) EXPORT_SYMBOL(mdiobus_scan); /** + * 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 + * + * NOTE: MUST NOT be called from interrupt context, + * because the bus read/write functions may wait for an interrupt + * to conclude the operation. + */ +int mdiobus_read(struct mii_bus *bus, int addr, u16 regnum) +{ + int retval; + + BUG_ON(in_interrupt()); + + mutex_lock(&bus->mdio_lock); + retval = bus->read(bus, addr, regnum); + mutex_unlock(&bus->mdio_lock); + + return retval; +} +EXPORT_SYMBOL(mdiobus_read); + +/** + * 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 + * + * NOTE: MUST NOT be called from interrupt context, + * because the bus read/write functions may wait for an interrupt + * to conclude the operation. + */ +int mdiobus_write(struct mii_bus *bus, int addr, u16 regnum, u16 val) +{ + int err; + + BUG_ON(in_interrupt()); + + mutex_lock(&bus->mdio_lock); + err = bus->write(bus, addr, regnum, val); + mutex_unlock(&bus->mdio_lock); + + return err; +} +EXPORT_SYMBOL(mdiobus_write); + +/** * mdio_bus_match - determine if given PHY driver supports the given PHY device * @dev: target PHY device * @drv: given PHY driver diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 0433fcd..a58cbd6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -68,16 +68,7 @@ EXPORT_SYMBOL(phy_print_status); */ int phy_read(struct phy_device *phydev, u16 regnum) { - int retval; - struct mii_bus *bus = phydev->bus; - - BUG_ON(in_interrupt()); - - mutex_lock(&bus->mdio_lock); - retval = bus->read(bus, phydev->addr, regnum); - mutex_unlock(&bus->mdio_lock); - - return retval; + return mdiobus_read(phydev->bus, phydev->addr, regnum); } EXPORT_SYMBOL(phy_read); @@ -93,16 +84,7 @@ EXPORT_SYMBOL(phy_read); */ int phy_write(struct phy_device *phydev, u16 regnum, u16 val) { - int err; - struct mii_bus *bus = phydev->bus; - - BUG_ON(in_interrupt()); - - mutex_lock(&bus->mdio_lock); - err = bus->write(bus, phydev->addr, regnum, val); - mutex_unlock(&bus->mdio_lock); - - return err; + return mdiobus_write(phydev->bus, phydev->addr, regnum, val); } EXPORT_SYMBOL(phy_write); diff --git a/include/linux/phy.h b/include/linux/phy.h index 891f27f..ddfb7fd 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -421,6 +421,8 @@ int mdiobus_register(struct mii_bus *bus); void mdiobus_unregister(struct mii_bus *bus); void mdiobus_free(struct mii_bus *bus); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); +int mdiobus_read(struct mii_bus *bus, int addr, u16 regnum); +int mdiobus_write(struct mii_bus *bus, int addr, u16 regnum, u16 val); void phy_sanitize_settings(struct phy_device *phydev); int phy_stop_interrupts(struct phy_device *phydev);
Add mdiobus_{read,write} routines to allow direct reading/writing of registers on an mii bus without having to go through the PHY abstraction, and make phy_{read,write} use these primitives. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> --- drivers/net/phy/mdio_bus.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ drivers/net/phy/phy.c | 22 +------------------ include/linux/phy.h | 2 + 3 files changed, 53 insertions(+), 20 deletions(-)