| Message ID | 20240828095103.132625-6-maxime.chevallier@bootlin.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ethernet: fs_enet: Cleanup and phylink conversion | expand |
Le 28/08/2024 à 11:51, Maxime Chevallier a écrit : > The PHY speed and duplex should be manipulated using the SPEED_XXX and > DUPLEX_XXX macros available. Use it in the fcc, fec and scc MAC for fs_enet. > > Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 4 ++-- > drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- > drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c > index add062928d99..056909156b4f 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c > +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c > @@ -361,7 +361,7 @@ static void restart(struct net_device *dev) > > /* adjust to speed (for RMII mode) */ > if (fpi->use_rmii) { > - if (dev->phydev->speed == 100) > + if (dev->phydev->speed == SPEED_100) > C8(fcccp, fcc_gfemr, 0x20); > else > S8(fcccp, fcc_gfemr, 0x20); > @@ -387,7 +387,7 @@ static void restart(struct net_device *dev) > S32(fccp, fcc_fpsmr, FCC_PSMR_RMII); > > /* adjust to duplex mode */ > - if (dev->phydev->duplex) > + if (dev->phydev->duplex == DUPLEX_FULL) > S32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB); > else > C32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB); > diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c > index f75acb3b358f..855ee9e3f042 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c > +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c > @@ -309,7 +309,7 @@ static void restart(struct net_device *dev) > /* > * adjust to duplex mode > */ > - if (dev->phydev->duplex) { > + if (dev->phydev->duplex == DUPLEX_FULL) { > FC(fecp, r_cntrl, FEC_RCNTRL_DRT); > FS(fecp, x_cntrl, FEC_TCNTRL_FDEN); /* FD enable */ > } else { > diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c > index 29ba0048396b..9e5e29312c27 100644 > --- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c > +++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c > @@ -338,7 +338,7 @@ static void restart(struct net_device *dev) > W16(sccp, scc_psmr, SCC_PSMR_ENCRC | SCC_PSMR_NIB22); > > /* Set full duplex mode if needed */ > - if (dev->phydev->duplex) > + if (dev->phydev->duplex == DUPLEX_FULL) > S16(sccp, scc_psmr, SCC_PSMR_LPB | SCC_PSMR_FDE); > > /* Restore multicast and promiscuous settings */
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c index add062928d99..056909156b4f 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c @@ -361,7 +361,7 @@ static void restart(struct net_device *dev) /* adjust to speed (for RMII mode) */ if (fpi->use_rmii) { - if (dev->phydev->speed == 100) + if (dev->phydev->speed == SPEED_100) C8(fcccp, fcc_gfemr, 0x20); else S8(fcccp, fcc_gfemr, 0x20); @@ -387,7 +387,7 @@ static void restart(struct net_device *dev) S32(fccp, fcc_fpsmr, FCC_PSMR_RMII); /* adjust to duplex mode */ - if (dev->phydev->duplex) + if (dev->phydev->duplex == DUPLEX_FULL) S32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB); else C32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB); diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c index f75acb3b358f..855ee9e3f042 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c @@ -309,7 +309,7 @@ static void restart(struct net_device *dev) /* * adjust to duplex mode */ - if (dev->phydev->duplex) { + if (dev->phydev->duplex == DUPLEX_FULL) { FC(fecp, r_cntrl, FEC_RCNTRL_DRT); FS(fecp, x_cntrl, FEC_TCNTRL_FDEN); /* FD enable */ } else { diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c index 29ba0048396b..9e5e29312c27 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c @@ -338,7 +338,7 @@ static void restart(struct net_device *dev) W16(sccp, scc_psmr, SCC_PSMR_ENCRC | SCC_PSMR_NIB22); /* Set full duplex mode if needed */ - if (dev->phydev->duplex) + if (dev->phydev->duplex == DUPLEX_FULL) S16(sccp, scc_psmr, SCC_PSMR_LPB | SCC_PSMR_FDE); /* Restore multicast and promiscuous settings */
The PHY speed and duplex should be manipulated using the SPEED_XXX and DUPLEX_XXX macros available. Use it in the fcc, fec and scc MAC for fs_enet. Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 4 ++-- drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)