hw/net/allwinner_emac: Replace MII_ANAR_TX -> MII_ANLPAR_TX definition

[PATCH] hw/net/allwinner_emac: Replace MII_ANAR_TX -> MII_ANLPAR_TX definition

Posted by Philippe Mathieu-Daudé 4 years, 2 months ago

While both MII_ANAR_TX / MII_ANLPAR_TX have the same value,
the ANAR and ANLPAR registers are different, so technically
the ANLPAR register have to use the MII_ANLPAR_TX definition.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/net/allwinner_emac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index ddddf35c45d..3aed92b8f1a 100644
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -50,7 +50,7 @@ static void mii_reset(RTL8201CPState *mii, bool link_ok)
                 MII_BMSR_10T_HD | MII_BMSR_MFPS | MII_BMSR_AUTONEG;
     mii->anar = MII_ANAR_TXFD | MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |
                 MII_ANAR_CSMACD;
-    mii->anlpar = MII_ANAR_TX;
+    mii->anlpar = MII_ANLPAR_TX;
 
     mii_set_link(mii, link_ok);
 }
-- 
2.31.1

Re: [PATCH] hw/net/allwinner_emac: Replace MII_ANAR_TX -> MII_ANLPAR_TX definition

Posted by Philippe Mathieu-Daudé 4 years, 1 month ago

Ping?

On 11/22/21 11:51, Philippe Mathieu-Daudé wrote:
> While both MII_ANAR_TX / MII_ANLPAR_TX have the same value,
> the ANAR and ANLPAR registers are different, so technically
> the ANLPAR register have to use the MII_ANLPAR_TX definition.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/net/allwinner_emac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
> index ddddf35c45d..3aed92b8f1a 100644
> --- a/hw/net/allwinner_emac.c
> +++ b/hw/net/allwinner_emac.c
> @@ -50,7 +50,7 @@ static void mii_reset(RTL8201CPState *mii, bool link_ok)
>                  MII_BMSR_10T_HD | MII_BMSR_MFPS | MII_BMSR_AUTONEG;
>      mii->anar = MII_ANAR_TXFD | MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |
>                  MII_ANAR_CSMACD;
> -    mii->anlpar = MII_ANAR_TX;
> +    mii->anlpar = MII_ANLPAR_TX;
>  
>      mii_set_link(mii, link_ok);
>  }
>

Re: [PATCH] hw/net/allwinner_emac: Replace MII_ANAR_TX -> MII_ANLPAR_TX definition

Posted by Laurent Vivier 4 years, 1 month ago

Le 15/12/2021 à 11:24, Philippe Mathieu-Daudé a écrit :
> Ping?
> 
> On 11/22/21 11:51, Philippe Mathieu-Daudé wrote:
>> While both MII_ANAR_TX / MII_ANLPAR_TX have the same value,
>> the ANAR and ANLPAR registers are different, so technically
>> the ANLPAR register have to use the MII_ANLPAR_TX definition.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>   hw/net/allwinner_emac.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
>> index ddddf35c45d..3aed92b8f1a 100644
>> --- a/hw/net/allwinner_emac.c
>> +++ b/hw/net/allwinner_emac.c
>> @@ -50,7 +50,7 @@ static void mii_reset(RTL8201CPState *mii, bool link_ok)
>>                   MII_BMSR_10T_HD | MII_BMSR_MFPS | MII_BMSR_AUTONEG;
>>       mii->anar = MII_ANAR_TXFD | MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |
>>                   MII_ANAR_CSMACD;
>> -    mii->anlpar = MII_ANAR_TX;
>> +    mii->anlpar = MII_ANLPAR_TX;
>>   
>>       mii_set_link(mii, link_ok);
>>   }
>>
> 

There are  other uses of anlpar with MII_ANAR_XXX values:

  34 static void mii_set_link(RTL8201CPState *mii, bool link_ok)
  35 {
  36     if (link_ok) {
  37         mii->bmsr |= MII_BMSR_LINK_ST | MII_BMSR_AN_COMP;
  38         mii->anlpar |= MII_ANAR_TXFD | MII_ANAR_10FD | MII_ANAR_10 |
  39                        MII_ANAR_CSMACD;
  40     } else {
  41         mii->bmsr &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
  42         mii->anlpar = MII_ANAR_TX;
  43     }
  44 }

Thanks,
Laurent