diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-07-23 15:47:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-24 21:09:52 -0400 |
commit | b3565f278a9babc00032292be489e7fbff4f48d1 (patch) | |
tree | 79f99cf6c55a5c9fc663357008f7e3b9b873cf8d | |
parent | a71e3c37960ce5f9c6a519bc1215e3ba9fa83e75 (diff) |
net: phy: Ensure the MDIO bus module is held
This commit adds proper module_{get,put} to prevent the MDIO bus module
from being unloaded while the phydev is connected. By doing so, we fix
a kernel panic produced when a MDIO driver is removed, but the phydev
that relies on it is attached and running.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/phy/phy_device.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 35d753d22f78..74a82328dd49 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
@@ -575,6 +575,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, | |||
575 | u32 flags, phy_interface_t interface) | 575 | u32 flags, phy_interface_t interface) |
576 | { | 576 | { |
577 | struct device *d = &phydev->dev; | 577 | struct device *d = &phydev->dev; |
578 | struct module *bus_module; | ||
578 | int err; | 579 | int err; |
579 | 580 | ||
580 | /* Assume that if there is no driver, that it doesn't | 581 | /* Assume that if there is no driver, that it doesn't |
@@ -599,6 +600,14 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, | |||
599 | return -EBUSY; | 600 | return -EBUSY; |
600 | } | 601 | } |
601 | 602 | ||
603 | /* Increment the bus module reference count */ | ||
604 | bus_module = phydev->bus->dev.driver ? | ||
605 | phydev->bus->dev.driver->owner : NULL; | ||
606 | if (!try_module_get(bus_module)) { | ||
607 | dev_err(&dev->dev, "failed to get the bus module\n"); | ||
608 | return -EIO; | ||
609 | } | ||
610 | |||
602 | phydev->attached_dev = dev; | 611 | phydev->attached_dev = dev; |
603 | dev->phydev = phydev; | 612 | dev->phydev = phydev; |
604 | 613 | ||
@@ -664,6 +673,10 @@ EXPORT_SYMBOL(phy_attach); | |||
664 | void phy_detach(struct phy_device *phydev) | 673 | void phy_detach(struct phy_device *phydev) |
665 | { | 674 | { |
666 | int i; | 675 | int i; |
676 | |||
677 | if (phydev->bus->dev.driver) | ||
678 | module_put(phydev->bus->dev.driver->owner); | ||
679 | |||
667 | phydev->attached_dev->phydev = NULL; | 680 | phydev->attached_dev->phydev = NULL; |
668 | phydev->attached_dev = NULL; | 681 | phydev->attached_dev = NULL; |
669 | phy_suspend(phydev); | 682 | phy_suspend(phydev); |