Skip to contentSkip to conversation

net: dsa: bcm_sf2: provide own phylink MAC operations

PATCH Applied Russell King (Oracle) 5 participants 7 messages Apr 16, 2024 – Apr 18, 2024

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: dsa: bcm_sf2: provide own phylink MAC operations

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

---
 drivers/net/dsa/bcm_sf2.c | 49 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 17 deletions(-)
drivers/net/dsa/bcm_sf2.c +32 -17
index bc77ee9e6d0a..ed1e6560df25 100644
@@ -740,16 +740,19 @@ static void bcm_sf2_sw_get_caps(struct dsa_switch *ds, int port,
 		MAC_10 | MAC_100 | MAC_1000;
 }
 
-static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
+static void bcm_sf2_sw_mac_config(struct phylink_config *config,
 				  unsigned int mode,
 				  const struct phylink_link_state *state)
 {
-	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
+	struct dsa_port *dp = dsa_phylink_to_port(config);
 	u32 id_mode_dis = 0, port_mode;
+	struct bcm_sf2_priv *priv;
 	u32 reg_rgmii_ctrl;
 	u32 reg;
 
-	if (port == core_readl(priv, CORE_IMP0_PRT_ID))
+	priv = bcm_sf2_to_priv(dp->ds);
+
+	if (dp->index == core_readl(priv, CORE_IMP0_PRT_ID))
 		return;
 
 	switch (state->interface) {
@@ -770,7 +773,7 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
 		return;
 	}
 
-	reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);
+	reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, dp->index);
 
 	/* Clear id_mode_dis bit, and the existing port mode, let
 	 * RGMII_MODE_EN bet set by mac_link_{up,down}
@@ -809,13 +812,16 @@ static void bcm_sf2_sw_mac_link_set(struct dsa_switch *ds, int port,
 	reg_writel(priv, reg, reg_rgmii_ctrl);
 }
 
-static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,
+static void bcm_sf2_sw_mac_link_down(struct phylink_config *config,
 				     unsigned int mode,
 				     phy_interface_t interface)
 {
-	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
+	struct dsa_port *dp = dsa_phylink_to_port(config);
+	struct bcm_sf2_priv *priv;
+	int port = dp->index;
 	u32 reg, offset;
 
+	priv = bcm_sf2_to_priv(dp->ds);
 	if (priv->wol_ports_mask & BIT(port))
 		return;
 
@@ -824,23 +830,26 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,
 	reg &= ~LINK_STS;
 	core_writel(priv, reg, offset);
 
-	bcm_sf2_sw_mac_link_set(ds, port, interface, false);
+	bcm_sf2_sw_mac_link_set(dp->ds, port, interface, false);
 }
 
-static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,
+static void bcm_sf2_sw_mac_link_up(struct phylink_config *config,
+				   struct phy_device *phydev,
 				   unsigned int mode,
 				   phy_interface_t interface,
-				   struct phy_device *phydev,
 				   int speed, int duplex,
 				   bool tx_pause, bool rx_pause)
 {
-	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
-	struct ethtool_keee *p = &priv->dev->ports[port].eee;
+	struct dsa_port *dp = dsa_phylink_to_port(config);
+	struct bcm_sf2_priv *priv;
 	u32 reg_rgmii_ctrl = 0;
+	struct ethtool_keee *p;
+	int port = dp->index;
 	u32 reg, offset;
 
-	bcm_sf2_sw_mac_link_set(ds, port, interface, true);
+	bcm_sf2_sw_mac_link_set(dp->ds, port, interface, true);
 
+	priv = bcm_sf2_to_priv(dp->ds);
 	offset = bcm_sf2_port_override_offset(priv, port);
 
 	if (phy_interface_mode_is_rgmii(interface) ||
@@ -886,8 +895,10 @@ static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,
 
 	core_writel(priv, reg, offset);
 
-	if (mode == MLO_AN_PHY && phydev)
-		p->eee_enabled = b53_eee_init(ds, port, phydev);
+	if (mode == MLO_AN_PHY && phydev) {
+		p = &priv->dev->ports[port].eee;
+		p->eee_enabled = b53_eee_init(dp->ds, port, phydev);
+	}
 }
 
 static void bcm_sf2_sw_fixed_state(struct dsa_switch *ds, int port,
@@ -1196,6 +1207,12 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch *ds, int port,
 	return cnt;
 }
 
+static const struct phylink_mac_ops bcm_sf2_phylink_mac_ops = {
+	.mac_config	= bcm_sf2_sw_mac_config,
+	.mac_link_down	= bcm_sf2_sw_mac_link_down,
+	.mac_link_up	= bcm_sf2_sw_mac_link_up,
+};
+
 static const struct dsa_switch_ops bcm_sf2_ops = {
 	.get_tag_protocol	= b53_get_tag_protocol,
 	.setup			= bcm_sf2_sw_setup,
@@ -1206,9 +1223,6 @@ static const struct dsa_switch_ops bcm_sf2_ops = {
 	.get_ethtool_phy_stats	= b53_get_ethtool_phy_stats,
 	.get_phy_flags		= bcm_sf2_sw_get_phy_flags,
 	.phylink_get_caps	= bcm_sf2_sw_get_caps,
-	.phylink_mac_config	= bcm_sf2_sw_mac_config,
-	.phylink_mac_link_down	= bcm_sf2_sw_mac_link_down,
-	.phylink_mac_link_up	= bcm_sf2_sw_mac_link_up,
 	.phylink_fixed_state	= bcm_sf2_sw_fixed_state,
 	.suspend		= bcm_sf2_sw_suspend,
 	.resume			= bcm_sf2_sw_resume,
@@ -1399,6 +1413,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
 	priv->dev = dev;
 	ds = dev->ds;
 	ds->ops = &bcm_sf2_ops;
+	ds->phylink_mac_ops = &bcm_sf2_phylink_mac_ops;
 
 	/* Advertise the 8 egress queues */
 	ds->num_tx_queues = SF2_NUM_EGRESS_QUEUES;
Signature · 1 line
2.30.2
#2 lore raw
Quoted 8 lines · Florian Fainelli
Quoted 4 lines · Russell King (Oracle)

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

Great, thanks for testing.

(Unrelated to this patch... so please don't delay applying based on ongoing discussion!)

The other Broadcom driver, b53, isn't going to be as simple - I believe it uses a mixture of the .adjust_link method for shared ports, and .phylink_mac_* for user ports. That makes it very awkward now, given the check that was added (and suggested by Vladimir) to check for the legacy methods if dsa_switch's .phylink_mac_ops is populated.

Is there any scope for converting b53 to use only phylink methods for everything, thus eliminating the .adjust_link callback?

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
maintainer
#3 lore raw
Quoted 15 lines · Russell King (Oracle)
Quoted 8 lines · Florian Fainelli
Quoted 4 lines · Russell King (Oracle)

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

Great, thanks for testing.

(Unrelated to this patch... so please don't delay applying based on ongoing discussion!)

Quoted 8 lines

The other Broadcom driver, b53, isn't going to be as simple - I believe it uses a mixture of the .adjust_link method for shared ports, and .phylink_mac_* for user ports. That makes it very awkward now, given the check that was added (and suggested by Vladimir) to check for the legacy methods if dsa_switch's .phylink_mac_ops is populated.

Is there any scope for converting b53 to use only phylink methods for everything, thus eliminating the .adjust_link callback?

It is on the TODO list for sure, and there might be a window later this week to actually work on removing the adjust_link callback once and for all.

Signature · 1 line
Florian
maintainer
#4 lore raw
Quoted 24 lines · Florian Fainelli
Quoted 21 lines · Russell King (Oracle)
Quoted 8 lines · Florian Fainelli
Quoted 4 lines · Russell King (Oracle)

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

Great, thanks for testing.

(Unrelated to this patch... so please don't delay applying based on ongoing discussion!)

The other Broadcom driver, b53, isn't going to be as simple - I believe it uses a mixture of the .adjust_link method for shared ports, and .phylink_mac_* for user ports. That makes it very awkward now, given the check that was added (and suggested by Vladimir) to check for the legacy methods if dsa_switch's .phylink_mac_ops is populated.

Quoted 4 lines
Quoted 2 lines

Is there any scope for converting b53 to use only phylink methods for everything, thus eliminating the .adjust_link callback?

It is on the TODO list for sure, and there might be a window later this week to actually work on removing the adjust_link callback once and for all.

This is what I came up with so far:

https://github.com/ffainelli/linux/commits/b53-phylink

Will test later today on the various devices I have.

Signature · 1 line
Florian
#5 lore raw
Quoted 32 lines · Florian Fainelli
Quoted 24 lines · Florian Fainelli
Quoted 21 lines · Russell King (Oracle)
Quoted 8 lines · Florian Fainelli
Quoted 4 lines · Russell King (Oracle)

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

Great, thanks for testing.

(Unrelated to this patch... so please don't delay applying based on ongoing discussion!)

The other Broadcom driver, b53, isn't going to be as simple - I believe it uses a mixture of the .adjust_link method for shared ports, and .phylink_mac_* for user ports. That makes it very awkward now, given the check that was added (and suggested by Vladimir) to check for the legacy methods if dsa_switch's .phylink_mac_ops is populated.

Quoted 6 lines
Quoted 2 lines

Is there any scope for converting b53 to use only phylink methods for everything, thus eliminating the .adjust_link callback?

It is on the TODO list for sure, and there might be a window later this week to actually work on removing the adjust_link callback once and for all.

Quoted 5 lines

This is what I came up with so far:

https://github.com/ffainelli/linux/commits/b53-phylink

Will test later today on the various devices I have.

A few comments...

In "net: dsa: b53: Configure RGMII for 531x5 and MII for 5325", the commit description says about adding to b53_mac_config(), but the code change modifies b53_phylink_mac_link_up(). I would think that the former (as mentioned in the commit message) was the better place for this rather than in b53_phylink_mac_link_up().

However, I see you move this to b53_phylink_mac_prepare() in "net: dsa: b53: Move MII/RGMII configuration to mac_prepare" but I'm not sure why you've chosen mac_prepare() over mac_config().

FYI, the order in which methods at the MAC and PCS are called on a reconfiguration is:

	mac_prepare()
	if changing pcs && oldpcs:
		oldpcs::pcs_disable()
	if newpcs:
		newpcs::pre_config()
	mac_config()
	if newpcs:
		newpcs::post_config()
		if changing pcs:
			newpcs::pcs_enable()
		newpcs::pcs_config()
		newpcs::pcs_an_restart()
	mac_finish()
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#6 lore raw
In reply to Russell King (Oracle)
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 7 lines · On Tue, 16 Apr 2024 11:19:03 +0100 you wrote:

Convert bcm_sf2 to provide its own phylink MAC operations, thus avoiding the shim layer in DSA's port.c

---
 drivers/net/dsa/bcm_sf2.c | 49 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 17 deletions(-)

Here is the summary with links:
- [net-next] net: dsa: bcm_sf2: provide own phylink MAC operations

    https://git.kernel.org/netdev/net-next/c/03d5a56ef795

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html