]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: sh_eth: do not advertise Gigabit capabilities when not available
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 8 Dec 2017 15:35:40 +0000 (16:35 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Dec 2017 16:53:55 +0000 (11:53 -0500)
Not all variants of the sh_eth hardware have Gigabit
support. Unfortunately, the current driver doesn't tell the PHY about
the limited MAC capabilities. Due to this, if you have a Gigabit
capable PHY, the PHY will advertise its Gigabit capability and
establish a link at 1Gbit/s, even though the MAC doesn't support it.

In order to avoid this, we use the recently introduced
phy_set_max_speed() to tell the PHY to not advertise speed higher than
100 MBit/s.

Tested on a SH7786 platform, with a Gigabit PHY.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/renesas/sh_eth.c

index db72d13cebb9e52c3e07ac9de09670b3f547af4b..75323000c3646bc781c12287367f8b455ada5a6a 100644 (file)
@@ -1892,6 +1892,16 @@ static int sh_eth_phy_init(struct net_device *ndev)
                return PTR_ERR(phydev);
        }
 
+       /* mask with MAC supported features */
+       if (mdp->cd->register_type != SH_ETH_REG_GIGABIT) {
+               int err = phy_set_max_speed(phydev, SPEED_100);
+               if (err) {
+                       netdev_err(ndev, "failed to limit PHY to 100 Mbit/s\n");
+                       phy_disconnect(phydev);
+                       return err;
+               }
+       }
+
        phy_attached_info(phydev);
 
        return 0;