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

Commit 69fc58a5 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: Manage fixed PHY address space using IDA 



If we have a system which uses fixed PHY devices and calls
fixed_phy_register() then fixed_phy_unregister() we can exhaust the
number of fixed PHYs available after a while, since we keep incrementing
the variable phy_fixed_addr, but we never decrement it.

This patch fixes that by converting the fixed PHY allocation to using
IDA, which takes care of the allocation/dealloaction of the PHY
addresses for us.

Fixes: a7595121 ("net: phy: extend fixed driver with fixed_phy_register()")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a0fee2b

drivers/net/phy/fixed_phy.c

+11 −11
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/gpio.h>

#include <linux/idr.h>



#define MII_REGS_NUM 29
@@ -286,6 +287,8 @@ int fixed_phy_add(unsigned int irq, int phy_addr, 
}

EXPORT_SYMBOL_GPL(fixed_phy_add);



static DEFINE_IDA(phy_fixed_ida);



static void fixed_phy_del(int phy_addr)

{

	struct fixed_mdio_bus *fmb = &platform_fmb;
@@ -297,14 +300,12 @@ static void fixed_phy_del(int phy_addr) 
			if (gpio_is_valid(fp->link_gpio))

				gpio_free(fp->link_gpio);

			kfree(fp);

			ida_simple_remove(&phy_fixed_ida, phy_addr);

			return;

		}

	}

}



static int phy_fixed_addr;

static DEFINE_SPINLOCK(phy_fixed_addr_lock);



struct phy_device *fixed_phy_register(unsigned int irq,

				      struct fixed_phy_status *status,

				      int link_gpio,
@@ -319,17 +320,15 @@ struct phy_device *fixed_phy_register(unsigned int irq, 
		return ERR_PTR(-EPROBE_DEFER);



	/* Get the next available PHY address, up to PHY_MAX_ADDR */

	spin_lock(&phy_fixed_addr_lock);

	if (phy_fixed_addr == PHY_MAX_ADDR) {

		spin_unlock(&phy_fixed_addr_lock);

		return ERR_PTR(-ENOSPC);

	}

	phy_addr = phy_fixed_addr++;

	spin_unlock(&phy_fixed_addr_lock);

	phy_addr = ida_simple_get(&phy_fixed_ida, 0, PHY_MAX_ADDR, GFP_KERNEL);

	if (phy_addr < 0)

		return ERR_PTR(phy_addr);



	ret = fixed_phy_add(irq, phy_addr, status, link_gpio);

	if (ret < 0)

	if (ret < 0) {

		ida_simple_remove(&phy_fixed_ida, phy_addr);

		return ERR_PTR(ret);

	}



	phy = get_phy_device(fmb->mii_bus, phy_addr, false);

	if (IS_ERR(phy)) {
@@ -434,6 +433,7 @@ static void __exit fixed_mdio_bus_exit(void) 
		list_del(&fp->node);

		kfree(fp);

	}

	ida_destroy(&phy_fixed_ida);

}

module_exit(fixed_mdio_bus_exit);