net: netcp: Do not clobber PHY link outside of state machine
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 6 Feb 2017 23:55:22 +0000 (15:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Feb 2017 18:48:22 +0000 (13:48 -0500)
Calling phy_read_status() means that we may call into
genphy_read_status() which in turn will use genphy_update_link() which
can make changes to phydev->link outside of the state machine's state
transitions. This is an invalid behavior that is now caught as off
811a919135b9 ("phy state machine: failsafe leave invalid RUNNING state")

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/netcp_ethss.c

index f7bb241..eece3e2 100644 (file)
@@ -2313,7 +2313,6 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf)
                dev_dbg(priv->dev, "phy found: id is: 0x%s\n",
                        phydev_name(slave->phy));
                phy_start(slave->phy);
-               phy_read_status(slave->phy);
        }
        return 0;
 }
@@ -3119,7 +3118,6 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
                        dev_dbg(dev, "phy found: id is: 0x%s\n",
                                phydev_name(slave->phy));
                        phy_start(slave->phy);
-                       phy_read_status(slave->phy);
                }
        }
 }