[U-Boot] Revert "net: macb: Fixed reading MII_LPA register"
diff mbox series

Message ID 1565778582-16750-1-git-send-email-bmeng.cn@gmail.com
State New
Delegated to: Joe Hershberger
Headers show
Series
  • [U-Boot] Revert "net: macb: Fixed reading MII_LPA register"
Related show

Commit Message

Bin Meng Aug. 14, 2019, 10:29 a.m. UTC
This reverts commit 1b0c9914cc75d1570359181ebd493cd5746cb0ed.

Commit 1b0c9914cc75 ("net: macb: Fixed reading MII_LPA register")
causes 100Mbps does not work any more with SiFive FU540 GEM on the
HiFive Unleashed board. Revert it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/net/macb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joe Hershberger Aug. 14, 2019, 6:57 p.m. UTC | #1
Hi Radu,

Is there something you can switch on to select the correct register on
the appropriate platform?

On Wed, Aug 14, 2019 at 5:31 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> This reverts commit 1b0c9914cc75d1570359181ebd493cd5746cb0ed.
>
> Commit 1b0c9914cc75 ("net: macb: Fixed reading MII_LPA register")
> causes 100Mbps does not work any more with SiFive FU540 GEM on the
> HiFive Unleashed board. Revert it.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Anup Patel Aug. 16, 2019, 2:46 a.m. UTC | #2
On Wed, Aug 14, 2019 at 4:01 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> This reverts commit 1b0c9914cc75d1570359181ebd493cd5746cb0ed.
>
> Commit 1b0c9914cc75 ("net: macb: Fixed reading MII_LPA register")
> causes 100Mbps does not work any more with SiFive FU540 GEM on the
> HiFive Unleashed board. Revert it.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  drivers/net/macb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index c99cf66..25f7913 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -643,7 +643,7 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
>
>         /* First check for GMAC and that it is GiB capable */
>         if (gem_is_gigabit_capable(macb)) {
> -               lpa = macb_mdio_read(macb, MII_LPA);
> +               lpa = macb_mdio_read(macb, MII_STAT1000);

You can do this selectively by having boolean flag in macb_config which is
only set for SiFive Unleashed.

Regards,
Anup

>
>                 if (lpa & (LPA_1000FULL | LPA_1000HALF | LPA_1000XFULL |
>                                         LPA_1000XHALF)) {
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Bin Meng Aug. 16, 2019, 2:19 p.m. UTC | #3
On Fri, Aug 16, 2019 at 10:46 AM Anup Patel <anup@brainfault.org> wrote:
>
> On Wed, Aug 14, 2019 at 4:01 PM Bin Meng <bmeng.cn@gmail.com> wrote:
> >
> > This reverts commit 1b0c9914cc75d1570359181ebd493cd5746cb0ed.
> >
> > Commit 1b0c9914cc75 ("net: macb: Fixed reading MII_LPA register")
> > causes 100Mbps does not work any more with SiFive FU540 GEM on the
> > HiFive Unleashed board. Revert it.
> >
> > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> > ---
> >
> >  drivers/net/macb.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> > index c99cf66..25f7913 100644
> > --- a/drivers/net/macb.c
> > +++ b/drivers/net/macb.c
> > @@ -643,7 +643,7 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
> >
> >         /* First check for GMAC and that it is GiB capable */
> >         if (gem_is_gigabit_capable(macb)) {
> > -               lpa = macb_mdio_read(macb, MII_LPA);
> > +               lpa = macb_mdio_read(macb, MII_STAT1000);
>
> You can do this selectively by having boolean flag in macb_config which is
> only set for SiFive Unleashed.

That does not look clean to me. I actually don't understand what the
issue the previous patch was trying to fix.

Maybe until we know that better we need revert to original codes...

Regards,
Bin

Patch
diff mbox series

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c99cf66..25f7913 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -643,7 +643,7 @@  static int macb_phy_init(struct macb_device *macb, const char *name)
 
 	/* First check for GMAC and that it is GiB capable */
 	if (gem_is_gigabit_capable(macb)) {
-		lpa = macb_mdio_read(macb, MII_LPA);
+		lpa = macb_mdio_read(macb, MII_STAT1000);
 
 		if (lpa & (LPA_1000FULL | LPA_1000HALF | LPA_1000XFULL |
 					LPA_1000XHALF)) {