diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2016-06-24 16:25:24 -0700 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:38:24 +0100 |
commit | 9a95f4c4b6e2205d8edd8dadecc7c7b869ea2aa1 (patch) | |
tree | a0ffc01e7003744a1615f9bc8436bab25cf76a0c /drivers | |
parent | ceb3c22785eac084942b48e0f0bed1048f7862df (diff) |
net: phy: Manage fixed PHY address space using IDA
commit 69fc58a57e56bf5e39b48809aefffdaa1b04c945 upstream.
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: a75951217472 ("net: phy: extend fixed driver with fixed_phy_register()")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16:
- Adjust filename, context
- fixed_phy_register() returns an integer, not a pointer/error]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/phy/fixed.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 5ea82da50ceb..28157ceadc48 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -22,6 +22,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> +#include <linux/idr.h> #define MII_REGS_NUM 29 @@ -204,6 +205,8 @@ err_regs: } EXPORT_SYMBOL_GPL(fixed_phy_add); +static DEFINE_IDA(phy_fixed_ida); + void fixed_phy_del(int phy_addr) { struct fixed_mdio_bus *fmb = &platform_fmb; @@ -213,15 +216,13 @@ void fixed_phy_del(int phy_addr) if (fp->addr == phy_addr) { list_del(&fp->node); kfree(fp); + ida_simple_remove(&phy_fixed_ida, phy_addr); return; } } } EXPORT_SYMBOL_GPL(fixed_phy_del); -static int phy_fixed_addr; -static DEFINE_SPINLOCK(phy_fixed_addr_lock); - int fixed_phy_register(unsigned int irq, struct fixed_phy_status *status, struct device_node *np) @@ -232,17 +233,15 @@ int fixed_phy_register(unsigned int irq, int ret; /* 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 -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 phy_addr; ret = fixed_phy_add(irq, phy_addr, status); - if (ret < 0) + if (ret < 0) { + ida_simple_remove(&phy_fixed_ida, phy_addr); return ret; + } phy = get_phy_device(fmb->mii_bus, phy_addr, false); if (!phy || IS_ERR(phy)) { @@ -317,6 +316,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); |