]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net: stmmac: Do not try to enable PHY EEE if MAC does not support it
authorJose Abreu <Jose.Abreu@synopsys.com>
Fri, 28 Jun 2019 07:29:13 +0000 (09:29 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Jun 2019 16:23:39 +0000 (09:23 -0700)
Do not enable EEE feature in the PHY if MAC does not support it.

Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 91f24b63ea16dbf42ef4b62ca93928cd35587268..0b1900bf4e9eae4c9ce7e32fa47cb2d754b65bde 100644 (file)
@@ -896,7 +896,7 @@ static void stmmac_mac_link_up(struct phylink_config *config,
        struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
 
        stmmac_mac_set(priv, priv->ioaddr, true);
-       if (phy) {
+       if (phy && priv->dma_cap.eee) {
                priv->eee_active = phy_init_eee(phy, 1) >= 0;
                priv->eee_enabled = stmmac_eee_init(priv);
                stmmac_set_eee_pls(priv, priv->hw, true);