net: phy: phy drivers should not set SUPPORTED_[Asym_]Pause

[linux.git] / drivers / net / phy / phy_device.c

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 32fa7c76f29ca55a1202d4a1b68c98e017546cc1..9c06f8028f0c349629365cbdc82f63f63b55c098 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -905,11 +905,17 @@ EXPORT_SYMBOL(phy_attached_print);
 int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
                      u32 flags, phy_interface_t interface)
 {
+       struct module *ndev_owner = dev->dev.parent->driver->owner;
        struct mii_bus *bus = phydev->mdio.bus;
        struct device *d = &phydev->mdio.dev;
        int err;
 
-       if (!try_module_get(bus->owner)) {
+       /* For Ethernet device drivers that register their own MDIO bus, we
+        * will have bus->owner match ndev_mod, so we do not want to increment
+        * our own module->refcnt here, otherwise we would not be able to
+        * unload later on.
+        */
+       if (ndev_owner != bus->owner && !try_module_get(bus->owner)) {
                dev_err(&dev->dev, "failed to get the bus module\n");
                return -EIO;
        }
@@ -971,7 +977,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
 error:
        phy_detach(phydev);
        put_device(d);
-       module_put(bus->owner);
+       if (ndev_owner != bus->owner)
+               module_put(bus->owner);
        return err;
 }
 EXPORT_SYMBOL(phy_attach_direct);
@@ -1021,6 +1028,8 @@ EXPORT_SYMBOL(phy_attach);
  */
 void phy_detach(struct phy_device *phydev)
 {
+       struct net_device *dev = phydev->attached_dev;
+       struct module *ndev_owner = dev->dev.parent->driver->owner;
        struct mii_bus *bus;
        int i;
 
@@ -1050,7 +1059,8 @@ void phy_detach(struct phy_device *phydev)
        bus = phydev->mdio.bus;
 
        put_device(&phydev->mdio.dev);
-       module_put(bus->owner);
+       if (ndev_owner != bus->owner)
+               module_put(bus->owner);
 }
 EXPORT_SYMBOL(phy_detach);
 
@@ -1709,6 +1719,25 @@ static int phy_probe(struct device *dev)
         */
        of_set_phy_eee_broken(phydev);
 
+       /* The Pause Frame bits indicate that the PHY can support passing
+        * pause frames. During autonegotiation, the PHYs will determine if
+        * they should allow pause frames to pass.  The MAC driver should then
+        * use that result to determine whether to enable flow control via
+        * pause frames.
+        *
+        * Normally, PHY drivers should not set the Pause bits, and instead
+        * allow phylib to do that.  However, there may be some situations
+        * (e.g. hardware erratum) where the driver wants to set only one
+        * of these bits.
+        */
+       if (phydrv->features & (SUPPORTED_Pause | SUPPORTED_Asym_Pause)) {
+               phydev->supported &= ~(SUPPORTED_Pause | SUPPORTED_Asym_Pause);
+               phydev->supported |= phydrv->features &
+                                    (SUPPORTED_Pause | SUPPORTED_Asym_Pause);
+       } else {
+               phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+       }
+
        /* Set the state to READY by default */
        phydev->state = PHY_READY;