From: Maxime Chevallier <maxime.chevallier@bootlin.com>
To: davem@davemloft.net,
Pantelis Antoniou <pantelis.antoniou@gmail.com>,
Andrew Lunn <andrew@lunn.ch>, Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Russell King <linux@armlinux.org.uk>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>
Cc: Maxime Chevallier <maxime.chevallier@bootlin.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
thomas.petazzoni@bootlin.com,
Herve Codina <herve.codina@bootlin.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH net-next 5/6] net: ethernet: fs_enet: fcc: use macros for speed and duplex values
Date: Wed, 28 Aug 2024 11:51:01 +0200 [thread overview]
Message-ID: <20240828095103.132625-6-maxime.chevallier@bootlin.com> (raw)
In-Reply-To: <20240828095103.132625-1-maxime.chevallier@bootlin.com>
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(-)
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 */
--
2.45.2
next prev parent reply other threads:[~2024-08-28 9:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-28 9:50 [PATCH net-next 0/6] net: ethernet: fs_enet: Cleanup and phylink conversion Maxime Chevallier
2024-08-28 9:50 ` [PATCH net-next 1/6] net: ethernet: fs_enet: convert to SPDX Maxime Chevallier
2024-08-28 10:12 ` Christophe Leroy
2024-08-28 9:50 ` [PATCH net-next 2/6] net: ethernet: fs_enet: cosmetic cleanups Maxime Chevallier
2024-08-28 10:16 ` Christophe Leroy
2024-08-28 9:50 ` [PATCH net-next 3/6] net: ethernet: fs_enet: drop the .adjust_link custom fs_ops Maxime Chevallier
2024-08-28 10:18 ` Christophe Leroy
2024-08-28 9:51 ` [PATCH net-next 4/6] net: ethernet: fs_enet: drop unused phy_info and mii_if_info Maxime Chevallier
2024-08-28 10:25 ` Christophe Leroy
2024-08-28 9:51 ` Maxime Chevallier [this message]
2024-08-28 10:27 ` [PATCH net-next 5/6] net: ethernet: fs_enet: fcc: use macros for speed and duplex values Christophe Leroy
2024-08-28 9:51 ` [PATCH net-next 6/6] net: ethernet: fs_enet: phylink conversion Maxime Chevallier
2024-08-28 10:38 ` Russell King (Oracle)
2024-08-28 11:44 ` Maxime Chevallier
2024-08-28 13:54 ` Russell King (Oracle)
2024-08-28 14:31 ` Maxime Chevallier
2024-08-28 16:32 ` Simon Horman
2024-08-29 8:46 ` Maxime Chevallier
2024-08-28 10:10 ` [PATCH net-next 0/6] net: ethernet: fs_enet: Cleanup and " Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240828095103.132625-6-maxime.chevallier@bootlin.com \
--to=maxime.chevallier@bootlin.com \
--cc=andrew@lunn.ch \
--cc=christophe.leroy@csgroup.eu \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=herve.codina@bootlin.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pantelis.antoniou@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®