| Message ID | 20210427152713.v1.5.Iffb0ea1939f77c16abfcdf4a426fa87b06db87da@changeid |
|---|---|
| State | Changes Requested |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | net: mvpp2: Sync Marvell mvpp2 driver with Marvell version | expand |
Hi, Stefan, > -----Original Message----- > From: Stefan Roese <sr@denx.de> > Sent: Tuesday, April 27, 2021 16:27 > To: u-boot@lists.denx.de > Cc: Stefan Chulski <stefanc@marvell.com>; Marcin Wojtas > <mw@semihalf.com>; Nadav Haklai <nadavh@marvell.com>; Marek Behun > <marek.behun@nic.cz>; Joe Hershberger <joe.hershberger@ni.com>; Kostya > Porotchkin <kostap@marvell.com>; Yan Markman > <ymarkman@marvell.com>; sa_ip-sw-jenkins <sa_ip-sw- > jenkins@marvell.com> > Subject: [EXT] [PATCH v1 05/10] net: mvpp2: Fix 2.5G GMII_SPEED > configurations > > External Email > > ---------------------------------------------------------------------- > From: Stefan Chulski <stefanc@marvell.com> > > GMII_SPEED should be enabled for 2.5G speed > > Signed-off-by: Stefan Chulski <stefanc@marvell.com> > Reviewed-by: Yan Markman <ymarkman@marvell.com> > Reviewed-by: Kostya Porotchkin <kostap@marvell.com> > Tested-by: sa_ip-sw-jenkins <sa_ip-sw-jenkins@marvell.com> > Signed-off-by: Stefan Roese <sr@denx.de> > --- > > drivers/net/mvpp2.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index > 2043bdf10aa4..ec7cb89a94c8 100644 > --- a/drivers/net/mvpp2.c > +++ b/drivers/net/mvpp2.c > @@ -4445,7 +4445,8 @@ static void mvpp2_link_event(struct mvpp2_port > *port) > if (phydev->duplex) > val |= MVPP2_GMAC_CONFIG_FULL_DUPLEX; > > - if (phydev->speed == SPEED_1000) > + if (phydev->speed == SPEED_1000 || > + phydev->speed == 2500) [KP] Shouldn't it be "SPEED_2500"? > val |= MVPP2_GMAC_CONFIG_GMII_SPEED; > else if (phydev->speed == SPEED_100) > val |= MVPP2_GMAC_CONFIG_MII_SPEED; > -- > 2.31.1
Hi Kosta, On 27.04.21 15:48, Kostya Porotchkin wrote: > Hi, Stefan, > >> -----Original Message----- >> From: Stefan Roese <sr@denx.de> >> Sent: Tuesday, April 27, 2021 16:27 >> To: u-boot@lists.denx.de >> Cc: Stefan Chulski <stefanc@marvell.com>; Marcin Wojtas >> <mw@semihalf.com>; Nadav Haklai <nadavh@marvell.com>; Marek Behun >> <marek.behun@nic.cz>; Joe Hershberger <joe.hershberger@ni.com>; Kostya >> Porotchkin <kostap@marvell.com>; Yan Markman >> <ymarkman@marvell.com>; sa_ip-sw-jenkins <sa_ip-sw- >> jenkins@marvell.com> >> Subject: [EXT] [PATCH v1 05/10] net: mvpp2: Fix 2.5G GMII_SPEED >> configurations >> >> External Email >> >> ---------------------------------------------------------------------- >> From: Stefan Chulski <stefanc@marvell.com> >> >> GMII_SPEED should be enabled for 2.5G speed >> >> Signed-off-by: Stefan Chulski <stefanc@marvell.com> >> Reviewed-by: Yan Markman <ymarkman@marvell.com> >> Reviewed-by: Kostya Porotchkin <kostap@marvell.com> >> Tested-by: sa_ip-sw-jenkins <sa_ip-sw-jenkins@marvell.com> >> Signed-off-by: Stefan Roese <sr@denx.de> >> --- >> >> drivers/net/mvpp2.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index >> 2043bdf10aa4..ec7cb89a94c8 100644 >> --- a/drivers/net/mvpp2.c >> +++ b/drivers/net/mvpp2.c >> @@ -4445,7 +4445,8 @@ static void mvpp2_link_event(struct mvpp2_port >> *port) >> if (phydev->duplex) >> val |= MVPP2_GMAC_CONFIG_FULL_DUPLEX; >> >> - if (phydev->speed == SPEED_1000) >> + if (phydev->speed == SPEED_1000 || >> + phydev->speed == 2500) > [KP] Shouldn't it be "SPEED_2500"? I agree in general. Please note that this is a verbatim copy from your SDK version. And checking, this is not a real issue as here the macros are defines as follows: include/linux/ethtool.h /* The forced speed, 10Mb, 100Mb, gigabit, 2.5Gb, 5Gb, 10GbE. */ #define SPEED_10 10 #define SPEED_100 100 #define SPEED_1000 1000 #define SPEED_2500 2500 #define SPEED_5000 5000 #define SPEED_10000 10000 We should perhaps change this some time though to always use the macro instead of the number. Thanks, Stefan
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 2043bdf10aa4..ec7cb89a94c8 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -4445,7 +4445,8 @@ static void mvpp2_link_event(struct mvpp2_port *port) if (phydev->duplex) val |= MVPP2_GMAC_CONFIG_FULL_DUPLEX; - if (phydev->speed == SPEED_1000) + if (phydev->speed == SPEED_1000 || + phydev->speed == 2500) val |= MVPP2_GMAC_CONFIG_GMII_SPEED; else if (phydev->speed == SPEED_100) val |= MVPP2_GMAC_CONFIG_MII_SPEED;