Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e888103 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller
Browse files

phylib: add mdiobus_{read,write} 



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: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46abc021

drivers/net/phy/mdio_bus.c

+49 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/phy/phy.c

+0 −49
Original line number Diff line number Diff line
@@ -57,55 +57,6 @@ void phy_print_status(struct phy_device *phydev) 
EXPORT_SYMBOL(phy_print_status);





/**

 * phy_read - Convenience function for reading a given PHY register

 * @phydev: the phy_device struct

 * @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 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;

}

EXPORT_SYMBOL(phy_read);



/**

 * phy_write - Convenience function for writing a given PHY register

 * @phydev: the phy_device struct

 * @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 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;

}

EXPORT_SYMBOL(phy_write);



/**

 * phy_clear_interrupt - Ack the phy device's interrupt

 * @phydev: the phy_device struct

include/linux/phy.h

+38 −8
Original line number Diff line number Diff line
@@ -122,6 +122,15 @@ struct mii_bus { 
};

#define to_mii_bus(d) container_of(d, struct mii_bus, dev)



struct mii_bus *mdiobus_alloc(void);

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);





#define PHY_INTERRUPT_DISABLED	0x0

#define PHY_INTERRUPT_ENABLED	0x80000000
@@ -399,8 +408,35 @@ struct phy_fixup { 
	int (*run)(struct phy_device *phydev);

};



int phy_read(struct phy_device *phydev, u16 regnum);

int phy_write(struct phy_device *phydev, u16 regnum, u16 val);

/**

 * phy_read - Convenience function for reading a given PHY register

 * @phydev: the phy_device struct

 * @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.

 */

static inline int phy_read(struct phy_device *phydev, u16 regnum)

{

	return mdiobus_read(phydev->bus, phydev->addr, regnum);

}



/**

 * phy_write - Convenience function for writing a given PHY register

 * @phydev: the phy_device struct

 * @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.

 */

static inline int phy_write(struct phy_device *phydev, u16 regnum, u16 val)

{

	return mdiobus_write(phydev->bus, phydev->addr, regnum, val);

}



int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);

struct phy_device* get_phy_device(struct mii_bus *bus, int addr);

int phy_clear_interrupt(struct phy_device *phydev);
@@ -416,12 +452,6 @@ void phy_start(struct phy_device *phydev); 
void phy_stop(struct phy_device *phydev);

int phy_start_aneg(struct phy_device *phydev);



struct mii_bus *mdiobus_alloc(void);

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);



void phy_sanitize_settings(struct phy_device *phydev);

int phy_stop_interrupts(struct phy_device *phydev);

int phy_enable_interrupts(struct phy_device *phydev);