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

Commit 298cf9be authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller
Browse files

phylib: move to dynamic allocation of struct mii_bus 



This patch introduces mdiobus_alloc() and mdiobus_free(), and
makes all mdio bus drivers use these functions to allocate their
struct mii_bus'es dynamically.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
parent 18ee49dd

drivers/net/au1000_eth.c

+27 −16
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int mii_probe (struct net_device *dev) 


	if(aup->mac_id == 0) { /* get PHY0 */

# if defined(AU1XXX_PHY0_ADDR)

		phydev = au_macs[AU1XXX_PHY0_BUSID]->mii_bus.phy_map[AU1XXX_PHY0_ADDR];

		phydev = au_macs[AU1XXX_PHY0_BUSID]->mii_bus->phy_map[AU1XXX_PHY0_ADDR];

# else

		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",

			dev->name);
@@ -298,7 +298,7 @@ static int mii_probe (struct net_device *dev) 
# endif /* defined(AU1XXX_PHY0_ADDR) */

	} else if (aup->mac_id == 1) { /* get PHY1 */

# if defined(AU1XXX_PHY1_ADDR)

		phydev = au_macs[AU1XXX_PHY1_BUSID]->mii_bus.phy_map[AU1XXX_PHY1_ADDR];

		phydev = au_macs[AU1XXX_PHY1_BUSID]->mii_bus->phy_map[AU1XXX_PHY1_ADDR];

# else

		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",

			dev->name);
@@ -311,8 +311,8 @@ static int mii_probe (struct net_device *dev) 


	/* find the first (lowest address) PHY on the current MAC's MII bus */

	for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)

		if (aup->mii_bus.phy_map[phy_addr]) {

			phydev = aup->mii_bus.phy_map[phy_addr];

		if (aup->mii_bus->phy_map[phy_addr]) {

			phydev = aup->mii_bus->phy_map[phy_addr];

# if !defined(AU1XXX_PHY_SEARCH_HIGHEST_ADDR)

			break; /* break out with first one found */

# endif
@@ -331,7 +331,7 @@ static int mii_probe (struct net_device *dev) 
		 * the MAC0 MII bus */

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

			struct phy_device *const tmp_phydev =

				au_macs[0]->mii_bus.phy_map[phy_addr];

				au_macs[0]->mii_bus->phy_map[phy_addr];



			if (!tmp_phydev)

				continue; /* no PHY here... */
@@ -698,28 +698,32 @@ static struct net_device * au1000_probe(int port_num) 
	*aup->enable = 0;

	aup->mac_enabled = 0;



	aup->mii_bus.priv = dev;

	aup->mii_bus.read = mdiobus_read;

	aup->mii_bus.write = mdiobus_write;

	aup->mii_bus.reset = mdiobus_reset;

	aup->mii_bus.name = "au1000_eth_mii";

	snprintf(aup->mii_bus.id, MII_BUS_ID_SIZE, "%x", aup->mac_id);

	aup->mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

	aup->mii_bus = mdiobus_alloc();

	if (aup->mii_bus == NULL)

		goto err_out;



	aup->mii_bus->priv = dev;

	aup->mii_bus->read = mdiobus_read;

	aup->mii_bus->write = mdiobus_write;

	aup->mii_bus->reset = mdiobus_reset;

	aup->mii_bus->name = "au1000_eth_mii";

	snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);

	aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

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

		aup->mii_bus.irq[i] = PHY_POLL;

		aup->mii_bus->irq[i] = PHY_POLL;



	/* if known, set corresponding PHY IRQs */

#if defined(AU1XXX_PHY_STATIC_CONFIG)

# if defined(AU1XXX_PHY0_IRQ)

	if (AU1XXX_PHY0_BUSID == aup->mac_id)

		aup->mii_bus.irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;

		aup->mii_bus->irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;

# endif

# if defined(AU1XXX_PHY1_IRQ)

	if (AU1XXX_PHY1_BUSID == aup->mac_id)

		aup->mii_bus.irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;

		aup->mii_bus->irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;

# endif

#endif

	mdiobus_register(&aup->mii_bus);

	mdiobus_register(aup->mii_bus);



	if (mii_probe(dev) != 0) {

		goto err_out;
@@ -775,6 +779,11 @@ static struct net_device * au1000_probe(int port_num) 
	return dev;



err_out:

	if (aup->mii_bus != NULL) {

		mdiobus_unregister(aup->mii_bus);

		mdiobus_free(aup->mii_bus);

	}



	/* here we should have a valid dev plus aup-> register addresses

	 * so we can reset the mac properly.*/

	reset_mac(dev);
@@ -1005,6 +1014,8 @@ static void __exit au1000_cleanup_module(void) 
		if (dev) {

			aup = (struct au1000_private *) dev->priv;

			unregister_netdev(dev);

			mdiobus_unregister(aup->mii_bus);

			mdiobus_free(aup->mii_bus);

			for (j = 0; j < NUM_RX_DMA; j++)

				if (aup->rx_db_inuse[j])

					ReleaseDB(aup, aup->rx_db_inuse[j]);

drivers/net/au1000_eth.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct au1000_private { 
	int old_duplex;



	struct phy_device *phy_dev;

	struct mii_bus mii_bus;

	struct mii_bus *mii_bus;



	/* These variables are just for quick access to certain regs addresses. */

	volatile mac_reg_t *mac;  /* mac registers                      */

drivers/net/bfin_mac.c

+19 −12
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int mii_probe(struct net_device *dev) 


	/* search for connect PHY device */

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

		struct phy_device *const tmp_phydev = lp->mii_bus.phy_map[i];

		struct phy_device *const tmp_phydev = lp->mii_bus->phy_map[i];



		if (!tmp_phydev)

			continue; /* no PHY here... */
@@ -1058,17 +1058,21 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) 
	setup_mac_addr(ndev->dev_addr);



	/* MDIO bus initial */

	lp->mii_bus.priv = ndev;

	lp->mii_bus.read = mdiobus_read;

	lp->mii_bus.write = mdiobus_write;

	lp->mii_bus.reset = mdiobus_reset;

	lp->mii_bus.name = "bfin_mac_mdio";

	snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "0");

	lp->mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

	lp->mii_bus = mdiobus_alloc();

	if (lp->mii_bus == NULL)

		goto out_err_mdiobus_alloc;



	lp->mii_bus->priv = ndev;

	lp->mii_bus->read = mdiobus_read;

	lp->mii_bus->write = mdiobus_write;

	lp->mii_bus->reset = mdiobus_reset;

	lp->mii_bus->name = "bfin_mac_mdio";

	snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "0");

	lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

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

		lp->mii_bus.irq[i] = PHY_POLL;

		lp->mii_bus->irq[i] = PHY_POLL;



	rc = mdiobus_register(&lp->mii_bus);

	rc = mdiobus_register(lp->mii_bus);

	if (rc) {

		dev_err(&pdev->dev, "Cannot register MDIO bus!\n");

		goto out_err_mdiobus_register;
@@ -1121,8 +1125,10 @@ out_err_reg_ndev: 
	free_irq(IRQ_MAC_RX, ndev);

out_err_request_irq:

out_err_mii_probe:

	mdiobus_unregister(&lp->mii_bus);

	mdiobus_unregister(lp->mii_bus);

out_err_mdiobus_register:

	mdiobus_free(lp->mii_bus);

out_err_mdiobus_alloc:

	peripheral_free_list(pin_req);

out_err_setup_pin_mux:

out_err_probe_mac:
@@ -1139,7 +1145,8 @@ static int __devexit bfin_mac_remove(struct platform_device *pdev) 


	platform_set_drvdata(pdev, NULL);



	mdiobus_unregister(&lp->mii_bus);

	mdiobus_unregister(lp->mii_bus);

	mdiobus_free(lp->mii_bus);



	unregister_netdev(ndev);

drivers/net/bfin_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct bfin_mac_local { 
	int old_duplex;



	struct phy_device *phydev;

	struct mii_bus mii_bus;

	struct mii_bus *mii_bus;

};



extern void bfin_get_ether_addr(char *addr);

drivers/net/cpmac.c

+30 −21
Original line number Diff line number Diff line
@@ -302,13 +302,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus) 


static int mii_irqs[PHY_MAX_ADDR] = { PHY_POLL, };



static struct mii_bus cpmac_mii = {

	.name = "cpmac-mii",

	.read = cpmac_mdio_read,

	.write = cpmac_mdio_write,

	.reset = cpmac_mdio_reset,

	.irq = mii_irqs,

};

static struct mii_bus *cpmac_mii;



static int cpmac_config(struct net_device *dev, struct ifmap *map)

{
@@ -1116,7 +1110,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {

		if (!(pdata->phy_mask & (1 << phy_id)))

			continue;

		if (!cpmac_mii.phy_map[phy_id])

		if (!cpmac_mii->phy_map[phy_id])

			continue;

		break;

	}
@@ -1168,7 +1162,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	priv->msg_enable = netif_msg_init(debug_level, 0xff);

	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));



	priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id,

	priv->phy = phy_connect(dev, cpmac_mii->phy_map[phy_id]->dev.bus_id,

				&cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);

	if (IS_ERR(priv->phy)) {

		if (netif_msg_drv(priv))
@@ -1216,11 +1210,22 @@ int __devinit cpmac_init(void) 
	u32 mask;

	int i, res;



	cpmac_mii.priv = ioremap(AR7_REGS_MDIO, 256);

	cpmac_mii = mdiobus_alloc();

	if (cpmac_mii == NULL)

		return -ENOMEM;



	cpmac_mii->name = "cpmac-mii";

	cpmac_mii->read = cpmac_mdio_read;

	cpmac_mii->write = cpmac_mdio_write;

	cpmac_mii->reset = cpmac_mdio_reset;

	cpmac_mii->irq = mii_irqs;



	cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);



	if (!cpmac_mii.priv) {

	if (!cpmac_mii->priv) {

		printk(KERN_ERR "Can't ioremap mdio registers\n");

		return -ENXIO;

		res = -ENXIO;

		goto fail_alloc;

	}



#warning FIXME: unhardcode gpio&reset bits
@@ -1230,10 +1235,10 @@ int __devinit cpmac_init(void) 
	ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);

	ar7_device_reset(AR7_RESET_BIT_EPHY);



	cpmac_mii.reset(&cpmac_mii);

	cpmac_mii->reset(cpmac_mii);



	for (i = 0; i < 300000; i++)

		if ((mask = cpmac_read(cpmac_mii.priv, CPMAC_MDIO_ALIVE)))

		if ((mask = cpmac_read(cpmac_mii->priv, CPMAC_MDIO_ALIVE)))

			break;

		else

			cpu_relax();
@@ -1244,10 +1249,10 @@ int __devinit cpmac_init(void) 
		mask = 0;

	}



	cpmac_mii.phy_mask = ~(mask | 0x80000000);

	snprintf(cpmac_mii.id, MII_BUS_ID_SIZE, "0");

	cpmac_mii->phy_mask = ~(mask | 0x80000000);

	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "0");



	res = mdiobus_register(&cpmac_mii);

	res = mdiobus_register(cpmac_mii);

	if (res)

		goto fail_mii;
@@ -1258,10 +1263,13 @@ int __devinit cpmac_init(void) 
	return 0;



fail_cpmac:

	mdiobus_unregister(&cpmac_mii);

	mdiobus_unregister(cpmac_mii);



fail_mii:

	iounmap(cpmac_mii.priv);

	iounmap(cpmac_mii->priv);



fail_alloc:

	mdiobus_free(cpmac_mii);



	return res;

}
@@ -1269,8 +1277,9 @@ fail_mii: 
void __devexit cpmac_exit(void)

{

	platform_driver_unregister(&cpmac_driver);

	mdiobus_unregister(&cpmac_mii);

	iounmap(cpmac_mii.priv);

	mdiobus_unregister(cpmac_mii);

	mdiobus_free(cpmac_mii);

	iounmap(cpmac_mii->priv);

}



module_init(cpmac_init);