mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge branch 'phy-mdio-refcnt'
Russell King says: ==================== Phy, mdiobus, and netdev struct device fixes The third version of this series fixes the build error which David identified, and drops the broken changes for the Cavium Thunger BGX ethernet driver as this driver requires some complex changes to resolve the leakage - and this is best done by people who can test the driver. Compared to v2, the only patch which has changed is patch 6 "net: fix phy refcounting in a bunch of drivers" I _think_ I've been able to build-test all the drivers touched by that patch to some degree now, though several of them needed the Kconfig hacked to allow it (not all had || COMPILE_TEST clause on their dependencies.) Previous cover letters below: This is the second version of the series, with the comments David had on the first patch fixed up. Original series description with updated diffstat below. While looking at the DSA code, I noticed we have a of_find_net_device_by_node(), and it looks like users of that are similarly buggy - it looks like net/dsa/dsa.c is the only user. Fix that too. Hi, While looking at the phy code, I identified a number of weaknesses where refcounting on device structures was being leaked, where modules could be removed while in-use, and where the fixed-phy could end up having unintended consequences caused by incorrect calls to fixed_phy_update_state(). This patch series resolves those issues, some of which were discovered with testing on an Armada 388 board. Not all patches are fully tested, particularly the one which touches several network drivers. When resolving the struct device refcounting problems, several different solutions were considered before settling on the implementation here - one of the considerations was to avoid touching many network drivers. The solution here is: phy_attach*() - takes a refcount phy_detach*() - drops the phy_attach refcount Provided drivers always attach and detach their phys, which they should already be doing, this should change nothing, even if they leak a refcount. of_phy_find_device() and of_* functions which use that take a refcount. Arrange for this refcount to be dropped once the phy is attached. This is the reason why the previous change is important - we can't drop this refcount taken by of_phy_find_device() until something else holds a reference on the device. This resolves the leaked refcount caused by using of_phy_connect() or of_phy_attach(). Even without the above changes, these drivers are leaking by calling of_phy_find_device(). These drivers are addressed by adding the appropriate release of that refcount. The mdiobus code also suffered from the same kind of leak, but thankfully this only happened in one place - the mdio-mux code. I also found that the try_module_get() in the phy layer code was utterly useless: phydev->dev.driver was guaranteed to always be NULL, so try_module_get() was always being called with a NULL argument. I proved this with my SFP code, which declares its own MDIO bus - the module use count was never incremented irrespective of how I set the MDIO bus up. This allowed the MDIO bus code to be removed from the kernel while there were still PHYs attached to it. One other bug was discovered: while using in-band-status with mvneta, it was found that if a real phy is attached with in-band-status enabled, and another ethernet interface is using the fixed-phy infrastructure, the interface using the fixed-phy infrastructure is configured according to the other interface using the in-band-status - which is caused by the fixed-phy code not verifying that the phy_device passed in is actually a fixed-phy device, rather than a real MDIO phy. Lastly, having mdio_bus reversing phy_device_register() internals seems like a layering violation - it's trivial to move that code to the phy device layer. ==================== Tested-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
b626ef0128
13 changed files with 181 additions and 51 deletions
|
@ -689,16 +689,24 @@ static int xgene_enet_phy_connect(struct net_device *ndev)
|
|||
netdev_dbg(ndev, "No phy-handle found in DT\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
pdata->phy_dev = of_phy_find_device(phy_np);
|
||||
}
|
||||
|
||||
phy_dev = pdata->phy_dev;
|
||||
phy_dev = of_phy_connect(ndev, phy_np, &xgene_enet_adjust_link,
|
||||
0, pdata->phy_mode);
|
||||
if (!phy_dev) {
|
||||
netdev_err(ndev, "Could not connect to PHY\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (!phy_dev ||
|
||||
phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link,
|
||||
pdata->phy_mode)) {
|
||||
netdev_err(ndev, "Could not connect to PHY\n");
|
||||
return -ENODEV;
|
||||
pdata->phy_dev = phy_dev;
|
||||
} else {
|
||||
phy_dev = pdata->phy_dev;
|
||||
|
||||
if (!phy_dev ||
|
||||
phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link,
|
||||
pdata->phy_mode)) {
|
||||
netdev_err(ndev, "Could not connect to PHY\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
|
||||
pdata->phy_speed = SPEED_UNKNOWN;
|
||||
|
|
|
@ -1710,8 +1710,10 @@ static void gfar_configure_serdes(struct net_device *dev)
|
|||
* everything for us? Resetting it takes the link down and requires
|
||||
* several seconds for it to come back.
|
||||
*/
|
||||
if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS)
|
||||
if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS) {
|
||||
put_device(&tbiphy->dev);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Single clk mode, mii mode off(for serdes communication) */
|
||||
phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);
|
||||
|
@ -1723,6 +1725,8 @@ static void gfar_configure_serdes(struct net_device *dev)
|
|||
phy_write(tbiphy, MII_BMCR,
|
||||
BMCR_ANENABLE | BMCR_ANRESTART | BMCR_FULLDPLX |
|
||||
BMCR_SPEED1000);
|
||||
|
||||
put_device(&tbiphy->dev);
|
||||
}
|
||||
|
||||
static int __gfar_is_rx_idle(struct gfar_private *priv)
|
||||
|
|
|
@ -1384,6 +1384,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
|
|||
value = phy_read(tbiphy, ENET_TBI_MII_CR);
|
||||
value &= ~0x1000; /* Turn off autonegotiation */
|
||||
phy_write(tbiphy, ENET_TBI_MII_CR, value);
|
||||
|
||||
put_device(&tbiphy->dev);
|
||||
}
|
||||
|
||||
init_check_frame_length_mode(ug_info->lengthCheckRx, &ug_regs->maccfg2);
|
||||
|
@ -1702,8 +1704,10 @@ static void uec_configure_serdes(struct net_device *dev)
|
|||
* everything for us? Resetting it takes the link down and requires
|
||||
* several seconds for it to come back.
|
||||
*/
|
||||
if (phy_read(tbiphy, ENET_TBI_MII_SR) & TBISR_LSTATUS)
|
||||
if (phy_read(tbiphy, ENET_TBI_MII_SR) & TBISR_LSTATUS) {
|
||||
put_device(&tbiphy->dev);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Single clk mode, mii mode off(for serdes communication) */
|
||||
phy_write(tbiphy, ENET_TBI_MII_ANA, TBIANA_SETTINGS);
|
||||
|
@ -1711,6 +1715,8 @@ static void uec_configure_serdes(struct net_device *dev)
|
|||
phy_write(tbiphy, ENET_TBI_MII_TBICON, TBICON_CLK_SELECT);
|
||||
|
||||
phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS);
|
||||
|
||||
put_device(&tbiphy->dev);
|
||||
}
|
||||
|
||||
/* Configure the PHY for dev.
|
||||
|
|
|
@ -3175,6 +3175,8 @@ static int mvneta_probe(struct platform_device *pdev)
|
|||
struct phy_device *phy = of_phy_find_device(dn);
|
||||
|
||||
mvneta_fixed_link_update(pp, phy);
|
||||
|
||||
put_device(&phy->dev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -828,6 +828,8 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
|
|||
if (!phydev)
|
||||
dev_info(dev,
|
||||
"MDIO of the phy is not registered yet\n");
|
||||
else
|
||||
put_device(&phydev->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@ int fixed_phy_update_state(struct phy_device *phydev,
|
|||
struct fixed_mdio_bus *fmb = &platform_fmb;
|
||||
struct fixed_phy *fp;
|
||||
|
||||
if (!phydev || !phydev->bus)
|
||||
if (!phydev || phydev->bus != fmb->mii_bus)
|
||||
return -EINVAL;
|
||||
|
||||
list_for_each_entry(fp, &fmb->phys, node) {
|
||||
|
|
|
@ -113,18 +113,18 @@ int mdio_mux_init(struct device *dev,
|
|||
if (!parent_bus_node)
|
||||
return -ENODEV;
|
||||
|
||||
parent_bus = of_mdio_find_bus(parent_bus_node);
|
||||
if (parent_bus == NULL) {
|
||||
ret_val = -EPROBE_DEFER;
|
||||
goto err_parent_bus;
|
||||
}
|
||||
|
||||
pb = devm_kzalloc(dev, sizeof(*pb), GFP_KERNEL);
|
||||
if (pb == NULL) {
|
||||
ret_val = -ENOMEM;
|
||||
goto err_parent_bus;
|
||||
}
|
||||
|
||||
parent_bus = of_mdio_find_bus(parent_bus_node);
|
||||
if (parent_bus == NULL) {
|
||||
ret_val = -EPROBE_DEFER;
|
||||
goto err_parent_bus;
|
||||
}
|
||||
|
||||
pb->switch_data = data;
|
||||
pb->switch_fn = switch_fn;
|
||||
pb->current_child = -1;
|
||||
|
@ -173,6 +173,10 @@ int mdio_mux_init(struct device *dev,
|
|||
dev_info(dev, "Version " DRV_VERSION "\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* balance the reference of_mdio_find_bus() took */
|
||||
put_device(&pb->mii_bus->dev);
|
||||
|
||||
err_parent_bus:
|
||||
of_node_put(parent_bus_node);
|
||||
return ret_val;
|
||||
|
@ -189,6 +193,9 @@ void mdio_mux_uninit(void *mux_handle)
|
|||
mdiobus_free(cb->mii_bus);
|
||||
cb = cb->next;
|
||||
}
|
||||
|
||||
/* balance the reference of_mdio_find_bus() in mdio_mux_init() took */
|
||||
put_device(&pb->mii_bus->dev);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mdio_mux_uninit);
|
||||
|
||||
|
|
|
@ -167,7 +167,9 @@ static int of_mdio_bus_match(struct device *dev, const void *mdio_bus_np)
|
|||
* of_mdio_find_bus - Given an mii_bus node, find the mii_bus.
|
||||
* @mdio_bus_np: Pointer to the mii_bus.
|
||||
*
|
||||
* Returns a pointer to the mii_bus, or NULL if none found.
|
||||
* Returns a reference to the mii_bus, or NULL if none found. The
|
||||
* embedded struct device will have its reference count incremented,
|
||||
* and this must be put once the bus is finished with.
|
||||
*
|
||||
* Because the association of a device_node and mii_bus is made via
|
||||
* of_mdiobus_register(), the mii_bus cannot be found before it is
|
||||
|
@ -242,7 +244,7 @@ static inline void of_mdiobus_link_phydev(struct mii_bus *mdio,
|
|||
*
|
||||
* Returns 0 on success or < 0 on error.
|
||||
*/
|
||||
int mdiobus_register(struct mii_bus *bus)
|
||||
int __mdiobus_register(struct mii_bus *bus, struct module *owner)
|
||||
{
|
||||
int i, err;
|
||||
|
||||
|
@ -253,6 +255,7 @@ int mdiobus_register(struct mii_bus *bus)
|
|||
BUG_ON(bus->state != MDIOBUS_ALLOCATED &&
|
||||
bus->state != MDIOBUS_UNREGISTERED);
|
||||
|
||||
bus->owner = owner;
|
||||
bus->dev.parent = bus->parent;
|
||||
bus->dev.class = &mdio_bus_class;
|
||||
bus->dev.groups = NULL;
|
||||
|
@ -288,13 +291,16 @@ int mdiobus_register(struct mii_bus *bus)
|
|||
|
||||
error:
|
||||
while (--i >= 0) {
|
||||
if (bus->phy_map[i])
|
||||
device_unregister(&bus->phy_map[i]->dev);
|
||||
struct phy_device *phydev = bus->phy_map[i];
|
||||
if (phydev) {
|
||||
phy_device_remove(phydev);
|
||||
phy_device_free(phydev);
|
||||
}
|
||||
}
|
||||
device_del(&bus->dev);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(mdiobus_register);
|
||||
EXPORT_SYMBOL(__mdiobus_register);
|
||||
|
||||
void mdiobus_unregister(struct mii_bus *bus)
|
||||
{
|
||||
|
@ -304,9 +310,11 @@ void mdiobus_unregister(struct mii_bus *bus)
|
|||
bus->state = MDIOBUS_UNREGISTERED;
|
||||
|
||||
for (i = 0; i < PHY_MAX_ADDR; i++) {
|
||||
if (bus->phy_map[i])
|
||||
device_unregister(&bus->phy_map[i]->dev);
|
||||
bus->phy_map[i] = NULL;
|
||||
struct phy_device *phydev = bus->phy_map[i];
|
||||
if (phydev) {
|
||||
phy_device_remove(phydev);
|
||||
phy_device_free(phydev);
|
||||
}
|
||||
}
|
||||
device_del(&bus->dev);
|
||||
}
|
||||
|
|
|
@ -383,6 +383,24 @@ int phy_device_register(struct phy_device *phydev)
|
|||
}
|
||||
EXPORT_SYMBOL(phy_device_register);
|
||||
|
||||
/**
|
||||
* phy_device_remove - Remove a previously registered phy device from the MDIO bus
|
||||
* @phydev: phy_device structure to remove
|
||||
*
|
||||
* This doesn't free the phy_device itself, it merely reverses the effects
|
||||
* of phy_device_register(). Use phy_device_free() to free the device
|
||||
* after calling this function.
|
||||
*/
|
||||
void phy_device_remove(struct phy_device *phydev)
|
||||
{
|
||||
struct mii_bus *bus = phydev->bus;
|
||||
int addr = phydev->addr;
|
||||
|
||||
device_del(&phydev->dev);
|
||||
bus->phy_map[addr] = NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_device_remove);
|
||||
|
||||
/**
|
||||
* phy_find_first - finds the first PHY device on the bus
|
||||
* @bus: the target MII bus
|
||||
|
@ -578,14 +596,22 @@ EXPORT_SYMBOL(phy_init_hw);
|
|||
* generic driver is used. The phy_device is given a ptr to
|
||||
* the attaching device, and given a callback for link status
|
||||
* change. The phy_device is returned to the attaching driver.
|
||||
* This function takes a reference on the phy device.
|
||||
*/
|
||||
int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
||||
u32 flags, phy_interface_t interface)
|
||||
{
|
||||
struct mii_bus *bus = phydev->bus;
|
||||
struct device *d = &phydev->dev;
|
||||
struct module *bus_module;
|
||||
int err;
|
||||
|
||||
if (!try_module_get(bus->owner)) {
|
||||
dev_err(&dev->dev, "failed to get the bus module\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
get_device(d);
|
||||
|
||||
/* Assume that if there is no driver, that it doesn't
|
||||
* exist, and we should use the genphy driver.
|
||||
*/
|
||||
|
@ -600,20 +626,13 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
|||
err = device_bind_driver(d);
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (phydev->attached_dev) {
|
||||
dev_err(&dev->dev, "PHY already attached\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
/* Increment the bus module reference count */
|
||||
bus_module = phydev->bus->dev.driver ?
|
||||
phydev->bus->dev.driver->owner : NULL;
|
||||
if (!try_module_get(bus_module)) {
|
||||
dev_err(&dev->dev, "failed to get the bus module\n");
|
||||
return -EIO;
|
||||
err = -EBUSY;
|
||||
goto error;
|
||||
}
|
||||
|
||||
phydev->attached_dev = dev;
|
||||
|
@ -636,6 +655,11 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
|||
phy_resume(phydev);
|
||||
|
||||
return err;
|
||||
|
||||
error:
|
||||
put_device(d);
|
||||
module_put(bus->owner);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_attach_direct);
|
||||
|
||||
|
@ -677,14 +701,15 @@ EXPORT_SYMBOL(phy_attach);
|
|||
/**
|
||||
* phy_detach - detach a PHY device from its network device
|
||||
* @phydev: target phy_device struct
|
||||
*
|
||||
* This detaches the phy device from its network device and the phy
|
||||
* driver, and drops the reference count taken in phy_attach_direct().
|
||||
*/
|
||||
void phy_detach(struct phy_device *phydev)
|
||||
{
|
||||
struct mii_bus *bus;
|
||||
int i;
|
||||
|
||||
if (phydev->bus->dev.driver)
|
||||
module_put(phydev->bus->dev.driver->owner);
|
||||
|
||||
phydev->attached_dev->phydev = NULL;
|
||||
phydev->attached_dev = NULL;
|
||||
phy_suspend(phydev);
|
||||
|
@ -700,6 +725,15 @@ void phy_detach(struct phy_device *phydev)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The phydev might go away on the put_device() below, so avoid
|
||||
* a use-after-free bug by reading the underlying bus first.
|
||||
*/
|
||||
bus = phydev->bus;
|
||||
|
||||
put_device(&phydev->dev);
|
||||
module_put(bus->owner);
|
||||
}
|
||||
EXPORT_SYMBOL(phy_detach);
|
||||
|
||||
|
|
|
@ -197,7 +197,8 @@ static int of_phy_match(struct device *dev, void *phy_np)
|
|||
* of_phy_find_device - Give a PHY node, find the phy_device
|
||||
* @phy_np: Pointer to the phy's device tree node
|
||||
*
|
||||
* Returns a pointer to the phy_device.
|
||||
* If successful, returns a pointer to the phy_device with the embedded
|
||||
* struct device refcount incremented by one, or NULL on failure.
|
||||
*/
|
||||
struct phy_device *of_phy_find_device(struct device_node *phy_np)
|
||||
{
|
||||
|
@ -217,7 +218,9 @@ EXPORT_SYMBOL(of_phy_find_device);
|
|||
* @hndlr: Link state callback for the network device
|
||||
* @iface: PHY data interface type
|
||||
*
|
||||
* Returns a pointer to the phy_device if successful. NULL otherwise
|
||||
* If successful, returns a pointer to the phy_device with the embedded
|
||||
* struct device refcount incremented by one, or NULL on failure. The
|
||||
* refcount must be dropped by calling phy_disconnect() or phy_detach().
|
||||
*/
|
||||
struct phy_device *of_phy_connect(struct net_device *dev,
|
||||
struct device_node *phy_np,
|
||||
|
@ -225,13 +228,19 @@ struct phy_device *of_phy_connect(struct net_device *dev,
|
|||
phy_interface_t iface)
|
||||
{
|
||||
struct phy_device *phy = of_phy_find_device(phy_np);
|
||||
int ret;
|
||||
|
||||
if (!phy)
|
||||
return NULL;
|
||||
|
||||
phy->dev_flags = flags;
|
||||
|
||||
return phy_connect_direct(dev, phy, hndlr, iface) ? NULL : phy;
|
||||
ret = phy_connect_direct(dev, phy, hndlr, iface);
|
||||
|
||||
/* refcount is held by phy_connect_direct() on success */
|
||||
put_device(&phy->dev);
|
||||
|
||||
return ret ? NULL : phy;
|
||||
}
|
||||
EXPORT_SYMBOL(of_phy_connect);
|
||||
|
||||
|
@ -241,17 +250,27 @@ EXPORT_SYMBOL(of_phy_connect);
|
|||
* @phy_np: Node pointer for the PHY
|
||||
* @flags: flags to pass to the PHY
|
||||
* @iface: PHY data interface type
|
||||
*
|
||||
* If successful, returns a pointer to the phy_device with the embedded
|
||||
* struct device refcount incremented by one, or NULL on failure. The
|
||||
* refcount must be dropped by calling phy_disconnect() or phy_detach().
|
||||
*/
|
||||
struct phy_device *of_phy_attach(struct net_device *dev,
|
||||
struct device_node *phy_np, u32 flags,
|
||||
phy_interface_t iface)
|
||||
{
|
||||
struct phy_device *phy = of_phy_find_device(phy_np);
|
||||
int ret;
|
||||
|
||||
if (!phy)
|
||||
return NULL;
|
||||
|
||||
return phy_attach_direct(dev, phy, flags, iface) ? NULL : phy;
|
||||
ret = phy_attach_direct(dev, phy, flags, iface);
|
||||
|
||||
/* refcount is held by phy_attach_direct() on success */
|
||||
put_device(&phy->dev);
|
||||
|
||||
return ret ? NULL : phy;
|
||||
}
|
||||
EXPORT_SYMBOL(of_phy_attach);
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <linux/spinlock.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/mii.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
@ -153,6 +154,7 @@ struct sk_buff;
|
|||
* PHYs should register using this structure
|
||||
*/
|
||||
struct mii_bus {
|
||||
struct module *owner;
|
||||
const char *name;
|
||||
char id[MII_BUS_ID_SIZE];
|
||||
void *priv;
|
||||
|
@ -198,7 +200,8 @@ static inline struct mii_bus *mdiobus_alloc(void)
|
|||
return mdiobus_alloc_size(0);
|
||||
}
|
||||
|
||||
int mdiobus_register(struct mii_bus *bus);
|
||||
int __mdiobus_register(struct mii_bus *bus, struct module *owner);
|
||||
#define mdiobus_register(bus) __mdiobus_register(bus, THIS_MODULE)
|
||||
void mdiobus_unregister(struct mii_bus *bus);
|
||||
void mdiobus_free(struct mii_bus *bus);
|
||||
struct mii_bus *devm_mdiobus_alloc_size(struct device *dev, int sizeof_priv);
|
||||
|
@ -742,6 +745,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
|
|||
struct phy_c45_device_ids *c45_ids);
|
||||
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
|
||||
int phy_device_register(struct phy_device *phy);
|
||||
void phy_device_remove(struct phy_device *phydev);
|
||||
int phy_init_hw(struct phy_device *phydev);
|
||||
int phy_suspend(struct phy_device *phydev);
|
||||
int phy_resume(struct phy_device *phydev);
|
||||
|
|
|
@ -1481,6 +1481,15 @@ static int of_dev_node_match(struct device *dev, const void *data)
|
|||
return ret == 0 ? dev->of_node == data : ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* of_find_net_device_by_node - lookup the net device for the device node
|
||||
* @np: OF device node
|
||||
*
|
||||
* Looks up the net_device structure corresponding with the device node.
|
||||
* If successful, returns a pointer to the net_device with the embedded
|
||||
* struct device refcount incremented by one, or NULL on failure. The
|
||||
* refcount must be dropped when done with the net_device.
|
||||
*/
|
||||
struct net_device *of_find_net_device_by_node(struct device_node *np)
|
||||
{
|
||||
struct device *dev;
|
||||
|
|
|
@ -634,6 +634,10 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
|
|||
port_index++;
|
||||
}
|
||||
kfree(pd->chip[i].rtable);
|
||||
|
||||
/* Drop our reference to the MDIO bus device */
|
||||
if (pd->chip[i].host_dev)
|
||||
put_device(pd->chip[i].host_dev);
|
||||
}
|
||||
kfree(pd->chip);
|
||||
}
|
||||
|
@ -661,16 +665,22 @@ static int dsa_of_probe(struct device *dev)
|
|||
return -EPROBE_DEFER;
|
||||
|
||||
ethernet = of_parse_phandle(np, "dsa,ethernet", 0);
|
||||
if (!ethernet)
|
||||
return -EINVAL;
|
||||
if (!ethernet) {
|
||||
ret = -EINVAL;
|
||||
goto out_put_mdio;
|
||||
}
|
||||
|
||||
ethernet_dev = of_find_net_device_by_node(ethernet);
|
||||
if (!ethernet_dev)
|
||||
return -EPROBE_DEFER;
|
||||
if (!ethernet_dev) {
|
||||
ret = -EPROBE_DEFER;
|
||||
goto out_put_mdio;
|
||||
}
|
||||
|
||||
pd = kzalloc(sizeof(*pd), GFP_KERNEL);
|
||||
if (!pd)
|
||||
return -ENOMEM;
|
||||
if (!pd) {
|
||||
ret = -ENOMEM;
|
||||
goto out_put_ethernet;
|
||||
}
|
||||
|
||||
dev->platform_data = pd;
|
||||
pd->of_netdev = ethernet_dev;
|
||||
|
@ -691,7 +701,9 @@ static int dsa_of_probe(struct device *dev)
|
|||
cd = &pd->chip[chip_index];
|
||||
|
||||
cd->of_node = child;
|
||||
cd->host_dev = &mdio_bus->dev;
|
||||
|
||||
/* When assigning the host device, increment its refcount */
|
||||
cd->host_dev = get_device(&mdio_bus->dev);
|
||||
|
||||
sw_addr = of_get_property(child, "reg", NULL);
|
||||
if (!sw_addr)
|
||||
|
@ -711,6 +723,12 @@ static int dsa_of_probe(struct device *dev)
|
|||
ret = -EPROBE_DEFER;
|
||||
goto out_free_chip;
|
||||
}
|
||||
|
||||
/* Drop the mdio_bus device ref, replacing the host
|
||||
* device with the mdio_bus_switch device, keeping
|
||||
* the refcount from of_mdio_find_bus() above.
|
||||
*/
|
||||
put_device(cd->host_dev);
|
||||
cd->host_dev = &mdio_bus_switch->dev;
|
||||
}
|
||||
|
||||
|
@ -744,6 +762,10 @@ static int dsa_of_probe(struct device *dev)
|
|||
}
|
||||
}
|
||||
|
||||
/* The individual chips hold their own refcount on the mdio bus,
|
||||
* so drop ours */
|
||||
put_device(&mdio_bus->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_chip:
|
||||
|
@ -751,6 +773,10 @@ static int dsa_of_probe(struct device *dev)
|
|||
out_free:
|
||||
kfree(pd);
|
||||
dev->platform_data = NULL;
|
||||
out_put_ethernet:
|
||||
put_device(ðernet_dev->dev);
|
||||
out_put_mdio:
|
||||
put_device(&mdio_bus->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -762,6 +788,7 @@ static void dsa_of_remove(struct device *dev)
|
|||
return;
|
||||
|
||||
dsa_of_free_platform_data(pd);
|
||||
put_device(&pd->of_netdev->dev);
|
||||
kfree(pd);
|
||||
}
|
||||
#else
|
||||
|
|
Loading…
Reference in a new issue