| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAGVrzcadkx5r68FOdGT=AhFEe-nMdkJu9Nib6dH1PogFe-Hm4Q@mail.gmail.com>
Date: Fri, 16 May 2014 11:28:17 -0700
From: Florian Fainelli <florian@...nwrt.org>
To: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Cc: "David S. Miller" <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
Tawfik Bayouk <tawfik@...vell.com>,
Nadav Haklai <nadavh@...vell.com>,
Lior Amsalem <alior@...vell.com>,
Gregory Clement <gregory.clement@...e-electrons.com>,
Ezequiel Garcia <ezequiel.garcia@...e-electrons.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
Grant Likely <grant.likely@...retlab.ca>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Sascha Hauer <s.hauer@...gutronix.de>,
Christian Gmeiner <christian.gmeiner@...il.com>
Subject: Re: [PATCHv4 2/5] net: phy: extend fixed driver with fixed_phy_register()
Hi Thomas,
2014-05-16 7:14 GMT-07:00 Thomas Petazzoni
<thomas.petazzoni@...e-electrons.com>:
> The existing fixed_phy_add() function has several drawbacks that
> prevents it from being used as is for OF-based declaration of fixed
> PHYs:
>
> * The address of the PHY on the fake bus needs to be passed, while a
> dynamic allocation is desired.
>
> * Since the phy_device instantiation is post-poned until the next
> mdiobus scan, there is no way to associate the fixed PHY with its
> OF node, which later prevents of_phy_connect() from finding this
> fixed PHY from a given OF node.
>
> To solve this, this commit introduces fixed_phy_register(), which will
> allocate an available PHY address, add the PHY using fixed_phy_add()
> and instantiate the phy_device structure associated with the provided
> OF node.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
> Acked-by: Florian Fainelli <f.fainelli@...il.com>
> Acked-by: Grant Likely <grant.likely@...aro.org>
Tested-by: Florian Fainelli <f.fainelli@...il.com>
> ---
> drivers/net/phy/fixed.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++
> include/linux/phy_fixed.h | 11 +++++++++
> 2 files changed, 72 insertions(+)
>
> diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
> index e41546d..d60d875 100644
> --- a/drivers/net/phy/fixed.c
> +++ b/drivers/net/phy/fixed.c
> @@ -21,6 +21,7 @@
> #include <linux/phy_fixed.h>
> #include <linux/err.h>
> #include <linux/slab.h>
> +#include <linux/of.h>
>
> #define MII_REGS_NUM 29
>
> @@ -203,6 +204,66 @@ err_regs:
> }
> EXPORT_SYMBOL_GPL(fixed_phy_add);
>
> +void fixed_phy_del(int phy_addr)
> +{
> + struct fixed_mdio_bus *fmb = &platform_fmb;
> + struct fixed_phy *fp, *tmp;
> +
> + list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
> + if (fp->addr == phy_addr) {
> + list_del(&fp->node);
> + kfree(fp);
> + 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)
> +{
> + struct fixed_mdio_bus *fmb = &platform_fmb;
> + struct phy_device *phy;
> + int phy_addr;
> + 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);
> +
> + ret = fixed_phy_add(PHY_POLL, phy_addr, status);
> + if (ret < 0)
> + return ret;
> +
> + phy = get_phy_device(fmb->mii_bus, phy_addr, false);
> + if (!phy || IS_ERR(phy)) {
> + fixed_phy_del(phy_addr);
> + return -EINVAL;
> + }
> +
> + of_node_get(np);
> + phy->dev.of_node = np;
> +
> + ret = phy_device_register(phy);
> + if (ret) {
> + phy_device_free(phy);
> + of_node_put(np);
> + fixed_phy_del(phy_addr);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static int __init fixed_mdio_bus_init(void)
> {
> struct fixed_mdio_bus *fmb = &platform_fmb;
> diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
> index 509d8f5..4f2478b 100644
> --- a/include/linux/phy_fixed.h
> +++ b/include/linux/phy_fixed.h
> @@ -9,15 +9,26 @@ struct fixed_phy_status {
> int asym_pause;
> };
>
> +struct device_node;
> +
> #ifdef CONFIG_FIXED_PHY
> extern int fixed_phy_add(unsigned int irq, int phy_id,
> struct fixed_phy_status *status);
> +extern int fixed_phy_register(unsigned int irq,
> + struct fixed_phy_status *status,
> + struct device_node *np);
> #else
> static inline int fixed_phy_add(unsigned int irq, int phy_id,
> struct fixed_phy_status *status)
> {
> return -ENODEV;
> }
> +static inline int fixed_phy_register(unsigned int irq,
> + struct fixed_phy_status *status,
> + struct device_node *np)
> +{
> + return -ENODEV;
> +}
> #endif /* CONFIG_FIXED_PHY */
>
> /*
> --
> 1.9.3
--
Florian
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists