| Message ID | 20171204141346.17410-1-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: sh_eth: do not advertise Gigabit capabilities when not available | expand |
On Mon, Dec 04, 2017 at 03:13:46PM +0100, Thomas Petazzoni wrote: > Not all variants of the sh_eth hardware have Gigabit > support. Unfortunately, the current driver doesn't update > phydev->supported depending on the 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 mark phydev->supported if we're running a > non-Gigabit capable hardware. > > Tested on a SH7786 platform, with a Gigabit PHY. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello! On 12/04/2017 05:13 PM, Thomas Petazzoni wrote: > Not all variants of the sh_eth hardware have Gigabit > support. Unfortunately, the current driver doesn't update > phydev->supported depending on the 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 mark phydev->supported if we're running a > non-Gigabit capable hardware. I guess this (being a fix) was targeted to net.git? > Tested on a SH7786 platform, with a Gigabit PHY. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [...] Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> MBR, Sergei
On 12/04/2017 05:13 PM, Thomas Petazzoni wrote: > Not all variants of the sh_eth hardware have Gigabit > support. Unfortunately, the current driver doesn't update > phydev->supported depending on the 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 mark phydev->supported if we're running a > non-Gigabit capable hardware. > > Tested on a SH7786 platform, with a Gigabit PHY. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > drivers/net/ethernet/renesas/sh_eth.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index db72d13cebb9..0074c5998481 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -1892,6 +1892,11 @@ 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) > + phydev->supported &= PHY_BASIC_FEATURES; > + phydev->advertising = phydev->supported; > + Um, looking at this again, I think we have phy_set_max_speed() for that kind of stuff now... [...] MBR, Sergei
> >diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > >index db72d13cebb9..0074c5998481 100644 > >--- a/drivers/net/ethernet/renesas/sh_eth.c > >+++ b/drivers/net/ethernet/renesas/sh_eth.c > >@@ -1892,6 +1892,11 @@ 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) > >+ phydev->supported &= PHY_BASIC_FEATURES; > >+ phydev->advertising = phydev->supported; > >+ > > Um, looking at this again, I think we have phy_set_max_speed() for that > kind of stuff now... Ah, yes. I forgot about that. Thomas, can you make a v2? Andrew
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index db72d13cebb9..0074c5998481 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1892,6 +1892,11 @@ 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) + phydev->supported &= PHY_BASIC_FEATURES; + phydev->advertising = phydev->supported; + phy_attached_info(phydev); return 0;
Not all variants of the sh_eth hardware have Gigabit support. Unfortunately, the current driver doesn't update phydev->supported depending on the 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 mark phydev->supported if we're running a non-Gigabit capable hardware. Tested on a SH7786 platform, with a Gigabit PHY. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/net/ethernet/renesas/sh_eth.c | 5 +++++ 1 file changed, 5 insertions(+)