Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1253132 > unrolled thread

[PATCH] net/phy: micrel: Add workaround for bad autoneg

Started byNathan Sullivan <nathan.sullivan@ni.com>
First post2015-10-21 21:20 +0200
Last post2015-10-23 11:50 +0200
Articles 5 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] net/phy: micrel: Add workaround for bad autoneg Nathan Sullivan <nathan.sullivan@ni.com> - 2015-10-21 21:20 +0200
    Re: [PATCH] net/phy: micrel: Add workaround for bad autoneg Florian Fainelli <f.fainelli@gmail.com> - 2015-10-21 21:30 +0200
      Re: [PATCH] net/phy: micrel: Add workaround for bad autoneg Nathan Sullivan <nathan.sullivan@ni.com> - 2015-10-21 21:50 +0200
        Re: [PATCH] net/phy: micrel: Add workaround for bad autoneg Florian Fainelli <f.fainelli@gmail.com> - 2015-10-21 23:50 +0200
    Re: [PATCH] net/phy: micrel: Add workaround for bad autoneg David Miller <davem@davemloft.net> - 2015-10-23 11:50 +0200

#1253132 — [PATCH] net/phy: micrel: Add workaround for bad autoneg

FromNathan Sullivan <nathan.sullivan@ni.com>
Date2015-10-21 21:20 +0200
Subject[PATCH] net/phy: micrel: Add workaround for bad autoneg
Message-ID<qm75v-3ST-1@gated-at.bofh.it>
Very rarely, the KSZ9031 will appear to complete autonegotiation, but
will drop all traffic afterwards.  When this happens, the idle error
count will read 0xFF after autonegotiation completes.  Reset the PHY
when in that state.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
---
 drivers/net/phy/micrel.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 499185e..cf6312f 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev)
 	return 0;
 }
 
+static int ksz9031_read_status(struct phy_device *phydev)
+{
+	int err;
+	int regval;
+
+	err = genphy_read_status(phydev);
+	if (err)
+		return err;
+
+	/* Make sure the PHY is not broken. Read idle error count,
+	 * and reset the PHY if it is maxed out.
+	 */
+	regval = phy_read(phydev, MII_STAT1000);
+	if ((regval & 0xFF) == 0xFF) {
+		phy_init_hw(phydev);
+		phydev->link = 0;
+	}
+
+	return 0;
+}
+
 static int ksz8873mll_config_aneg(struct phy_device *phydev)
 {
 	return 0;
@@ -772,7 +793,7 @@ static struct phy_driver ksphy_driver[] = {
 	.driver_data	= &ksz9021_type,
 	.config_init	= ksz9031_config_init,
 	.config_aneg	= genphy_config_aneg,
-	.read_status	= genphy_read_status,
+	.read_status	= ksz9031_read_status,
 	.ack_interrupt	= kszphy_ack_interrupt,
 	.config_intr	= kszphy_config_intr,
 	.suspend	= genphy_suspend,
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1253150

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2015-10-21 21:30 +0200
Message-ID<qm7fd-44l-33@gated-at.bofh.it>
In reply to#1253132
2015-10-21 12:17 GMT-07:00 Nathan Sullivan <nathan.sullivan@ni.com>:
> Very rarely, the KSZ9031 will appear to complete autonegotiation, but
> will drop all traffic afterwards.  When this happens, the idle error
> count will read 0xFF after autonegotiation completes.  Reset the PHY
> when in that state.
>
> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
> ---
>  drivers/net/phy/micrel.c |   23 ++++++++++++++++++++++-
>  1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 499185e..cf6312f 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev)
>         return 0;
>  }
>
> +static int ksz9031_read_status(struct phy_device *phydev)
> +{
> +       int err;
> +       int regval;
> +
> +       err = genphy_read_status(phydev);
> +       if (err)
> +               return err;
> +
> +       /* Make sure the PHY is not broken. Read idle error count,
> +        * and reset the PHY if it is maxed out.
> +        */
> +       regval = phy_read(phydev, MII_STAT1000);
> +       if ((regval & 0xFF) == 0xFF) {

Don't you also need to set phydev->state to PHY_READY here to force
the state machine to restart?

> +               phy_init_hw(phydev);
> +               phydev->link = 0;
> +       }
> +
> +       return 0;
> +}
> +
>  static int ksz8873mll_config_aneg(struct phy_device *phydev)
>  {
>         return 0;
> @@ -772,7 +793,7 @@ static struct phy_driver ksphy_driver[] = {
>         .driver_data    = &ksz9021_type,
>         .config_init    = ksz9031_config_init,
>         .config_aneg    = genphy_config_aneg,
> -       .read_status    = genphy_read_status,
> +       .read_status    = ksz9031_read_status,
>         .ack_interrupt  = kszphy_ack_interrupt,
>         .config_intr    = kszphy_config_intr,
>         .suspend        = genphy_suspend,
> --
> 1.7.10.4
>



-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1253159

FromNathan Sullivan <nathan.sullivan@ni.com>
Date2015-10-21 21:50 +0200
Message-ID<qm7yy-4s1-13@gated-at.bofh.it>
In reply to#1253150
On Wed, Oct 21, 2015 at 12:20:21PM -0700, Florian Fainelli wrote:
> 2015-10-21 12:17 GMT-07:00 Nathan Sullivan <nathan.sullivan@ni.com>:
> > Very rarely, the KSZ9031 will appear to complete autonegotiation, but
> > will drop all traffic afterwards.  When this happens, the idle error
> > count will read 0xFF after autonegotiation completes.  Reset the PHY
> > when in that state.
> >
> > Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
> > ---
> >  drivers/net/phy/micrel.c |   23 ++++++++++++++++++++++-
> >  1 file changed, 22 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> > index 499185e..cf6312f 100644
> > --- a/drivers/net/phy/micrel.c
> > +++ b/drivers/net/phy/micrel.c
> > @@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev)
> >         return 0;
> >  }
> >
> > +static int ksz9031_read_status(struct phy_device *phydev)
> > +{
> > +       int err;
> > +       int regval;
> > +
> > +       err = genphy_read_status(phydev);
> > +       if (err)
> > +               return err;
> > +
> > +       /* Make sure the PHY is not broken. Read idle error count,
> > +        * and reset the PHY if it is maxed out.
> > +        */
> > +       regval = phy_read(phydev, MII_STAT1000);
> > +       if ((regval & 0xFF) == 0xFF) {
> 
> Don't you also need to set phydev->state to PHY_READY here to force
> the state machine to restart?
>

I don't think so, we stay in the PHY_AN state since phy_init_hw will restart
autonegotiation.  Setting link=0 will go through PHY_NOLINK then back to
PHY_AN, so we wait for autoneg to complete again.

> > +               phy_init_hw(phydev);
> > +               phydev->link = 0;
> > +       }
> > +
> > +       return 0;
> > +}
> > +
> >  static int ksz8873mll_config_aneg(struct phy_device *phydev)
> >  {
> >         return 0;
> > @@ -772,7 +793,7 @@ static struct phy_driver ksphy_driver[] = {
> >         .driver_data    = &ksz9021_type,
> >         .config_init    = ksz9031_config_init,
> >         .config_aneg    = genphy_config_aneg,
> > -       .read_status    = genphy_read_status,
> > +       .read_status    = ksz9031_read_status,
> >         .ack_interrupt  = kszphy_ack_interrupt,
> >         .config_intr    = kszphy_config_intr,
> >         .suspend        = genphy_suspend,
> > --
> > 1.7.10.4
> >
> 
> 
> 
> -- 
> Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1253281

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2015-10-21 23:50 +0200
Message-ID<qm9qG-7aO-25@gated-at.bofh.it>
In reply to#1253159
On 21/10/15 12:42, Nathan Sullivan wrote:
> On Wed, Oct 21, 2015 at 12:20:21PM -0700, Florian Fainelli wrote:
>> 2015-10-21 12:17 GMT-07:00 Nathan Sullivan <nathan.sullivan@ni.com>:
>>> Very rarely, the KSZ9031 will appear to complete autonegotiation, but
>>> will drop all traffic afterwards.  When this happens, the idle error
>>> count will read 0xFF after autonegotiation completes.  Reset the PHY
>>> when in that state.
>>>
>>> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
>>> ---
>>>  drivers/net/phy/micrel.c |   23 ++++++++++++++++++++++-
>>>  1 file changed, 22 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
>>> index 499185e..cf6312f 100644
>>> --- a/drivers/net/phy/micrel.c
>>> +++ b/drivers/net/phy/micrel.c
>>> @@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev)
>>>         return 0;
>>>  }
>>>
>>> +static int ksz9031_read_status(struct phy_device *phydev)
>>> +{
>>> +       int err;
>>> +       int regval;
>>> +
>>> +       err = genphy_read_status(phydev);
>>> +       if (err)
>>> +               return err;
>>> +
>>> +       /* Make sure the PHY is not broken. Read idle error count,
>>> +        * and reset the PHY if it is maxed out.
>>> +        */
>>> +       regval = phy_read(phydev, MII_STAT1000);
>>> +       if ((regval & 0xFF) == 0xFF) {
>>
>> Don't you also need to set phydev->state to PHY_READY here to force
>> the state machine to restart?
>>
> 
> I don't think so, we stay in the PHY_AN state since phy_init_hw will restart
> autonegotiation.  Setting link=0 will go through PHY_NOLINK then back to
> PHY_AN, so we wait for autoneg to complete again.

Good point, thanks for clarifiying that part.
-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1254440

FromDavid Miller <davem@davemloft.net>
Date2015-10-23 11:50 +0200
Message-ID<qmH8Z-5X0-5@gated-at.bofh.it>
In reply to#1253132
From: Nathan Sullivan <nathan.sullivan@ni.com>
Date: Wed, 21 Oct 2015 14:17:04 -0500

> Very rarely, the KSZ9031 will appear to complete autonegotiation, but
> will drop all traffic afterwards.  When this happens, the idle error
> count will read 0xFF after autonegotiation completes.  Reset the PHY
> when in that state.
> 
> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web