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

Commit 4dea547f authored by Grant Likely's avatar Grant Likely Committed by David S. Miller
Browse files

phylib: rework to prepare for OF registration of PHYs 



This patch makes changes in preparation for supporting open firmware
device tree descriptions of MDIO busses.  Changes include:
- Cleanup handling of phy_map[] entries; they are already NULLed when
  registering and so don't need to be re-cleared, and it is good practice
  to clear them out when unregistering.
- Split phy_device registration out into a new function so that the
  OF helpers can do two stage registration (separate allocation and
  registration steps).

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 739649c5

drivers/net/phy/mdio_bus.c

+3 −26
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ int mdiobus_register(struct mii_bus *bus) 
		bus->reset(bus);



	for (i = 0; i < PHY_MAX_ADDR; i++) {

		bus->phy_map[i] = NULL;

		if ((bus->phy_mask & (1 << i)) == 0) {

			struct phy_device *phydev;
@@ -150,6 +149,7 @@ void mdiobus_unregister(struct mii_bus *bus) 
	for (i = 0; i < PHY_MAX_ADDR; i++) {

		if (bus->phy_map[i])

			device_unregister(&bus->phy_map[i]->dev);

		bus->phy_map[i] = NULL;

	}

}

EXPORT_SYMBOL(mdiobus_unregister);
@@ -188,35 +188,12 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) 
	if (IS_ERR(phydev) || phydev == NULL)

		return phydev;



	/* There's a PHY at this address

	 * We need to set:

	 * 1) IRQ

	 * 2) bus_id

	 * 3) parent

	 * 4) bus

	 * 5) mii_bus

	 * And, we need to register it */



	phydev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;



	phydev->dev.parent = bus->parent;

	phydev->dev.bus = &mdio_bus_type;

	dev_set_name(&phydev->dev, PHY_ID_FMT, bus->id, addr);



	phydev->bus = bus;



	/* Run all of the fixups for this PHY */

	phy_scan_fixups(phydev);



	err = device_register(&phydev->dev);

	err = phy_device_register(phydev);

	if (err) {

		printk(KERN_ERR "phy %d failed to register\n", addr);

		phy_device_free(phydev);

		phydev = NULL;

		return NULL;

	}



	bus->phy_map[addr] = phydev;



	return phydev;

}

EXPORT_SYMBOL(mdiobus_scan);

drivers/net/phy/phy_device.c

+41 −4
Original line number Diff line number Diff line
@@ -39,20 +39,21 @@ MODULE_DESCRIPTION("PHY library"); 
MODULE_AUTHOR("Andy Fleming");

MODULE_LICENSE("GPL");



static struct phy_driver genphy_driver;

extern int mdio_bus_init(void);

extern void mdio_bus_exit(void);



void phy_device_free(struct phy_device *phydev)

{

	kfree(phydev);

}

EXPORT_SYMBOL(phy_device_free);



static void phy_device_release(struct device *dev)

{

	phy_device_free(to_phy_device(dev));

}



static struct phy_driver genphy_driver;

extern int mdio_bus_init(void);

extern void mdio_bus_exit(void);



static LIST_HEAD(phy_fixup_list);

static DEFINE_MUTEX(phy_fixup_lock);
@@ -166,6 +167,10 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) 
	dev->addr = addr;

	dev->phy_id = phy_id;

	dev->bus = bus;

	dev->dev.parent = bus->parent;

	dev->dev.bus = &mdio_bus_type;

	dev->irq = bus->irq != NULL ? bus->irq[addr] : PHY_POLL;

	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);



	dev->state = PHY_DOWN;
@@ -235,6 +240,38 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr) 


	return dev;

}

EXPORT_SYMBOL(get_phy_device);



/**

 * phy_device_register - Register the phy device on the MDIO bus

 * @phy_device: phy_device structure to be added to the MDIO bus

 */

int phy_device_register(struct phy_device *phydev)

{

	int err;



	/* Don't register a phy if one is already registered at this

	 * address */

	if (phydev->bus->phy_map[phydev->addr])

		return -EINVAL;

	phydev->bus->phy_map[phydev->addr] = phydev;



	/* Run all of the fixups for this PHY */

	phy_scan_fixups(phydev);



	err = device_register(&phydev->dev);

	if (err) {

		pr_err("phy %d failed to register\n", phydev->addr);

		goto out;

	}



	return 0;



 out:

	phydev->bus->phy_map[phydev->addr] = NULL;

	return err;

}

EXPORT_SYMBOL(phy_device_register);



/**

 * phy_prepare_link - prepares the PHY layer to monitor link status

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ static inline int phy_write(struct phy_device *phydev, u16 regnum, u16 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_device_register(struct phy_device *phy);

int phy_clear_interrupt(struct phy_device *phydev);

int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);

struct phy_device * phy_attach(struct net_device *dev,