From: Florian Fainelli <florian.fainelli@broadcom.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <florian.fainelli@broadcom.com>,
Andrew Lunn <andrew@lunn.ch>, Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Russell King <linux@armlinux.org.uk>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net-next 7/8] net: dsa: b53: Remove b53_adjust_link()
Date: Tue, 23 Apr 2024 11:33:38 -0700 [thread overview]
Message-ID: <20240423183339.1368511-8-florian.fainelli@broadcom.com> (raw)
In-Reply-To: <20240423183339.1368511-1-florian.fainelli@broadcom.com>
Only use the PHYLINK implementation from there on now that an equivalent
configuration is applied to all of the switch ports.
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/net/dsa/b53/b53_common.c | 40 --------------------------------
1 file changed, 40 deletions(-)
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index a4b50ee97f87..e490ef0fd3f1 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1332,45 +1332,6 @@ static void b53_adjust_5325_mii(struct dsa_switch *ds, int port)
}
}
-static void b53_adjust_link(struct dsa_switch *ds, int port,
- struct phy_device *phydev)
-{
- struct b53_device *dev = ds->priv;
- struct ethtool_keee *p = &dev->ports[port].eee;
- bool tx_pause = false;
- bool rx_pause = false;
-
- if (!phy_is_pseudo_fixed_link(phydev))
- return;
-
- /* Enable flow control on BCM5301x's CPU port */
- if (is5301x(dev) && dsa_is_cpu_port(ds, port))
- tx_pause = rx_pause = true;
-
- if (phydev->pause) {
- if (phydev->asym_pause)
- tx_pause = true;
- rx_pause = true;
- }
-
- b53_force_port_config(dev, port, phydev->speed, phydev->duplex,
- tx_pause, rx_pause);
- b53_force_link(dev, port, phydev->link);
-
- if (is63xx(dev) && port >= B53_63XX_RGMII0)
- b53_adjust_63xx_rgmii(ds, port, phydev->interface);
-
- if (is531x5(dev) && phy_interface_is_rgmii(phydev))
- b53_adjust_531x5_rgmii(ds, port, phydev->interface);
-
- /* configure MII port if necessary */
- if (is5325(dev))
- b53_adjust_5325_mii(ds, port);
-
- /* Re-negotiate EEE if it was enabled already */
- p->eee_enabled = b53_eee_init(ds, port, phydev);
-}
-
void b53_port_event(struct dsa_switch *ds, int port)
{
struct b53_device *dev = ds->priv;
@@ -2308,7 +2269,6 @@ static const struct dsa_switch_ops b53_switch_ops = {
.get_ethtool_phy_stats = b53_get_ethtool_phy_stats,
.phy_read = b53_phy_read16,
.phy_write = b53_phy_write16,
- .adjust_link = b53_adjust_link,
.phylink_get_caps = b53_phylink_get_caps,
.phylink_mac_select_pcs = b53_phylink_mac_select_pcs,
.phylink_mac_config = b53_phylink_mac_config,
--
2.34.1
next prev parent reply other threads:[~2024-04-23 18:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 18:33 [PATCH net-next 0/8] net: dsa: b53: Remove adjust_link Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 1/8] net: dsa: b53: Stop exporting b53_phylink_* routines Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 2/8] net: dsa: b53: Introduce b53_adjust_531x5_rgmii() Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 3/8] net: dsa: b53: Introduce b53_adjust_5325_mii() Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 4/8] net: dsa: b53: Force flow control for BCM5301X CPU port(s) Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 5/8] net: dsa: b53: Configure RGMII for 531x5 and MII for 5325 Florian Fainelli
2024-04-23 18:33 ` [PATCH net-next 6/8] net: dsa: b53: Call b53_eee_init() from b53_mac_link_up() Florian Fainelli
2024-04-23 18:33 ` Florian Fainelli [this message]
2024-04-23 18:33 ` [PATCH net-next 8/8] net: dsa: b53: provide own phylink MAC operations Florian Fainelli
2024-04-23 19:14 ` [PATCH net-next 0/8] net: dsa: b53: Remove adjust_link Russell King (Oracle)
2024-04-23 19:15 ` Florian Fainelli
2024-04-23 21:16 ` Russell King (Oracle)
2024-04-25 18:50 ` patchwork-bot+netdevbpf
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=20240423183339.1368511-8-florian.fainelli@broadcom.com \
--to=florian.fainelli@broadcom.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.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®