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

Commit f2ebf2a6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixed-phy-phydev-leaks' 



Johan Hovold says:

====================
net: fix fixed-link phydev leaks

This series fixes failures to deregister and free fixed-link phydevs
that have been registered using the of_phy_register_fixed_link()
interface.

All but two drivers currently fail to do this and this series fixes most
of them with the exception of a staging driver and the stmmac drivers
which will be fixed by follow-on patches.

Included are also a couple of fixes for related of-node leaks.

Note that all patches except the of_mdio one have been compile-tested
only.

Also note that the series is against net due to dependencies not yet in
net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a5108878 881eadab

drivers/net/ethernet/altera/altera_tse_main.c

+8 −1
Original line number Diff line number Diff line
@@ -819,6 +819,8 @@ static int init_phy(struct net_device *dev) 


	if (!phydev) {

		netdev_err(dev, "Could not find the PHY\n");

		if (fixed_link)

			of_phy_deregister_fixed_link(priv->device->of_node);

		return -ENODEV;

	}
@@ -1545,10 +1547,15 @@ static int altera_tse_probe(struct platform_device *pdev) 
static int altera_tse_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct altera_tse_private *priv = netdev_priv(ndev);



	if (ndev->phydev)

	if (ndev->phydev) {

		phy_disconnect(ndev->phydev);



		if (of_phy_is_fixed_link(priv->device->of_node))

			of_phy_deregister_fixed_link(priv->device->of_node);

	}



	platform_set_drvdata(pdev, NULL);

	altera_tse_mdio_destroy(ndev);

	unregister_netdev(ndev);

drivers/net/ethernet/aurora/nb8800.c

+7 −2
Original line number Diff line number Diff line
@@ -1466,12 +1466,12 @@ static int nb8800_probe(struct platform_device *pdev) 


	ret = nb8800_hw_init(dev);

	if (ret)

		goto err_free_bus;

		goto err_deregister_fixed_link;



	if (ops && ops->init) {

		ret = ops->init(dev);

		if (ret)

			goto err_free_bus;

			goto err_deregister_fixed_link;

	}



	dev->netdev_ops = &nb8800_netdev_ops;
@@ -1504,6 +1504,9 @@ static int nb8800_probe(struct platform_device *pdev) 


err_free_dma:

	nb8800_dma_free(dev);

err_deregister_fixed_link:

	if (of_phy_is_fixed_link(pdev->dev.of_node))

		of_phy_deregister_fixed_link(pdev->dev.of_node);

err_free_bus:

	of_node_put(priv->phy_node);

	mdiobus_unregister(bus);
@@ -1521,6 +1524,8 @@ static int nb8800_remove(struct platform_device *pdev) 
	struct nb8800_priv *priv = netdev_priv(ndev);



	unregister_netdev(ndev);

	if (of_phy_is_fixed_link(pdev->dev.of_node))

		of_phy_deregister_fixed_link(pdev->dev.of_node);

	of_node_put(priv->phy_node);



	mdiobus_unregister(priv->mii_bus);

drivers/net/ethernet/broadcom/bcmsysport.c

+12 −5
Original line number Diff line number Diff line
@@ -1755,13 +1755,13 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
	if (priv->irq0 <= 0 || priv->irq1 <= 0) {

		dev_err(&pdev->dev, "invalid interrupts\n");

		ret = -EINVAL;

		goto err;

		goto err_free_netdev;

	}



	priv->base = devm_ioremap_resource(&pdev->dev, r);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto err;

		goto err_free_netdev;

	}



	priv->netdev = dev;
@@ -1779,7 +1779,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
		ret = of_phy_register_fixed_link(dn);

		if (ret) {

			dev_err(&pdev->dev, "failed to register fixed PHY\n");

			goto err;

			goto err_free_netdev;

		}



		priv->phy_dn = dn;
@@ -1821,7 +1821,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
	ret = register_netdev(dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to register net_device\n");

		goto err;

		goto err_deregister_fixed_link;

	}



	priv->rev = topctrl_readl(priv, REV_CNTL) & REV_MASK;
@@ -1832,7 +1832,11 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
		 priv->base, priv->irq0, priv->irq1, txq, rxq);



	return 0;

err:



err_deregister_fixed_link:

	if (of_phy_is_fixed_link(dn))

		of_phy_deregister_fixed_link(dn);

err_free_netdev:

	free_netdev(dev);

	return ret;

}
@@ -1840,11 +1844,14 @@ static int bcm_sysport_probe(struct platform_device *pdev) 
static int bcm_sysport_remove(struct platform_device *pdev)

{

	struct net_device *dev = dev_get_drvdata(&pdev->dev);

	struct device_node *dn = pdev->dev.of_node;



	/* Not much to do, ndo_close has been called

	 * and we use managed allocations

	 */

	unregister_netdev(dev);

	if (of_phy_is_fixed_link(dn))

		of_phy_deregister_fixed_link(dn);

	free_netdev(dev);

	dev_set_drvdata(&pdev->dev, NULL);

drivers/net/ethernet/broadcom/genet/bcmmii.c

+6 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv) 
int bcmgenet_mii_init(struct net_device *dev)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device_node *dn = priv->pdev->dev.of_node;

	int ret;



	ret = bcmgenet_mii_alloc(priv);
@@ -640,6 +641,8 @@ int bcmgenet_mii_init(struct net_device *dev) 
	return 0;



out:

	if (of_phy_is_fixed_link(dn))

		of_phy_deregister_fixed_link(dn);

	of_node_put(priv->phy_dn);

	mdiobus_unregister(priv->mii_bus);

	mdiobus_free(priv->mii_bus);
@@ -649,7 +652,10 @@ int bcmgenet_mii_init(struct net_device *dev) 
void bcmgenet_mii_exit(struct net_device *dev)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device_node *dn = priv->pdev->dev.of_node;



	if (of_phy_is_fixed_link(dn))

		of_phy_deregister_fixed_link(dn);

	of_node_put(priv->phy_dn);

	mdiobus_unregister(priv->mii_bus);

	mdiobus_free(priv->mii_bus);

drivers/net/ethernet/freescale/fec_main.c

+5 −0
Original line number Diff line number Diff line
@@ -3475,6 +3475,8 @@ fec_probe(struct platform_device *pdev) 
failed_clk_ipg:

	fec_enet_clk_enable(ndev, false);

failed_clk:

	if (of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

failed_phy:

	of_node_put(phy_node);

failed_ioremap:
@@ -3488,6 +3490,7 @@ fec_drv_remove(struct platform_device *pdev) 
{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct fec_enet_private *fep = netdev_priv(ndev);

	struct device_node *np = pdev->dev.of_node;



	cancel_work_sync(&fep->tx_timeout_work);

	fec_ptp_stop(pdev);
@@ -3495,6 +3498,8 @@ fec_drv_remove(struct platform_device *pdev) 
	fec_enet_mii_remove(fep);

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);

	if (of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

	of_node_put(fep->phy_node);

	free_netdev(ndev);