From: Florian Fainelli <f.fainelli@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>, David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Subject: Re: [PATCH net-next 5/5] phy: fixed: Fix removal of phys.
Date: Fri, 11 Mar 2016 15:18:40 -0800 [thread overview]
Message-ID: <56E35250.6020101@gmail.com> (raw)
In-Reply-To: <1457737300-23660-6-git-send-email-andrew@lunn.ch>
On 11/03/16 15:01, Andrew Lunn wrote:
> The fixed phys delete function simply removed the fixed phy from the
> internal linked list and freed the memory. It however did not
> unregister the associated phy device. This meant it was still possible
> to find the phy device on the mdio bus.
>
> Make fixed_phy_del() an internal function and add a
> fixed_phy_unregister() to unregisters the phy device and then uses
> fixed_phy_del() to free resources.
>
> Modify DSA to use this new API function, so we don't leak phys.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> drivers/net/phy/fixed_phy.c | 11 +++++++++--
> include/linux/phy_fixed.h | 5 ++---
> net/dsa/dsa.c | 4 +---
> 3 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
> index ab9c473d75ea..fc07a8866020 100644
> --- a/drivers/net/phy/fixed_phy.c
> +++ b/drivers/net/phy/fixed_phy.c
> @@ -285,7 +285,7 @@ err_regs:
> }
> EXPORT_SYMBOL_GPL(fixed_phy_add);
>
> -void fixed_phy_del(int phy_addr)
> +static void fixed_phy_del(int phy_addr)
> {
> struct fixed_mdio_bus *fmb = &platform_fmb;
> struct fixed_phy *fp, *tmp;
> @@ -300,7 +300,6 @@ void fixed_phy_del(int phy_addr)
> }
> }
> }
> -EXPORT_SYMBOL_GPL(fixed_phy_del);
>
> static int phy_fixed_addr;
> static DEFINE_SPINLOCK(phy_fixed_addr_lock);
> @@ -371,6 +370,14 @@ struct phy_device *fixed_phy_register(unsigned int irq,
> }
> EXPORT_SYMBOL_GPL(fixed_phy_register);
>
> +void fixed_phy_unregister(struct phy_device *phy)
> +{
> + phy_device_remove(phy);
> +
> + fixed_phy_del(phy->mdio.addr);
fixed_phy_del() should also make sure that there is no dangling
link_update callback registered, even though this is not fatal, as it
checks whether the phydev is NULL, we should automatically unregister
one by doing something like: fixed_phy_set_link_update(phydev, NULL) for
robustness.
LGTM to me otherwise, thanks!
--
Florian
next prev parent reply other threads:[~2016-03-11 23:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-11 23:01 [PATCH net-next 0/5] DSA cleanup and fixes Andrew Lunn
2016-03-11 23:01 ` [PATCH net-next 1/5] dsa: Rename mv88e6123_61_65 to mv88e6123 to be consistent Andrew Lunn
2016-03-13 7:10 ` Vivien Didelot
2016-03-13 15:51 ` Andrew Lunn
2016-03-13 18:48 ` Vivien Didelot
2016-03-11 23:01 ` [PATCH net-next 2/5] dsa: slave: Don't reference NULL pointer during phy_disconnect Andrew Lunn
2016-03-11 23:01 ` [PATCH net-next 3/5] dsa: Destroy fixed link phys after the phy has been disconnected Andrew Lunn
2016-03-11 23:01 ` [PATCH net-next 4/5] dsa: dsa: Fix freeing of fixed-phys from user ports Andrew Lunn
2016-03-11 23:01 ` [PATCH net-next 5/5] phy: fixed: Fix removal of phys Andrew Lunn
2016-03-11 23:18 ` Florian Fainelli [this message]
2016-03-12 17:24 ` Andrew Lunn
2016-03-14 19:44 ` [PATCH net-next 0/5] DSA cleanup and fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56E35250.6020101@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).