Skip to contentSkip to conversation

convert sja1105 xpcs creation and remove xpcs_create

PATCH Applied Russell King (Oracle) 4 participants 9 messages Jun 2, 2023 – Jun 5, 2023

Subsystems (6)
lore
Share & tools
lore

Russell King (Oracle)

author reviewer
#0 lore raw

cover convert sja1105 xpcs creation and remove xpcs_create

Hi,

This series of three patches converts sja1105 to use the newly provided xpcs_create_mdiodev(), and as there become no users of xpcs_create(), removes this function from the global namespace to discourage future direct use.

 drivers/net/dsa/sja1105/sja1105_mdio.c | 11 +----------
 drivers/net/pcs/pcs-xpcs.c             |  5 ++---
 include/linux/pcs/pcs-xpcs.h           |  2 --
 3 files changed, 3 insertions(+), 15 deletions(-)
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!
#1 lore raw

PATCH 1/3 net: dsa: sja1105: allow XPCS to handle mdiodev lifetime

Put the mdiodev after xpcs_create() so that the XPCS driver can manage the lifetime of the mdiodev its using.

---
 drivers/net/dsa/sja1105/sja1105_mdio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/sja1105/sja1105_mdio.c +1 -2
index 01f1cb719042..166fe747f70a 100644
@@ -417,6 +417,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		}
 
 		xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);
+		mdio_device_put(mdiodev);
 		if (IS_ERR(xpcs)) {
 			rc = PTR_ERR(xpcs);
 			goto out_pcs_free;
@@ -434,7 +435,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
@@ -457,7 +457,6 @@ static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
Signature · 1 line
2.30.2
#4 lore raw

PATCH 2/3 net: dsa: sja1105: use xpcs_create_mdiodev()

In reply to Russell King (Oracle)

Use the new xpcs_create_mdiodev() creator, which simplifies the creation and destruction of the mdio device associated with xpcs.

---
 drivers/net/dsa/sja1105/sja1105_mdio.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/net/dsa/sja1105/sja1105_mdio.c +1 -9
index 166fe747f70a..833e55e4b961 100644
@@ -400,7 +400,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 	}
 
 	for (port = 0; port < ds->num_ports; port++) {
-		struct mdio_device *mdiodev;
 		struct dw_xpcs *xpcs;
 
 		if (dsa_is_unused_port(ds, port))
@@ -410,14 +409,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		    priv->phy_mode[port] != PHY_INTERFACE_MODE_2500BASEX)
 			continue;
 
-		mdiodev = mdio_device_create(bus, port);
-		if (IS_ERR(mdiodev)) {
-			rc = PTR_ERR(mdiodev);
-			goto out_pcs_free;
-		}
-
-		xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);
-		mdio_device_put(mdiodev);
+		xpcs = xpcs_create_mdiodev(bus, port, priv->phy_mode[port]);
 		if (IS_ERR(xpcs)) {
 			rc = PTR_ERR(xpcs);
 			goto out_pcs_free;
Signature · 1 line
2.30.2
#6 lore raw

PATCH 3/3 net: pcs: xpcs: remove xpcs_create() from public view

In reply to Russell King (Oracle)

There are now no callers of xpcs_create(), so let's remove it from public view to discourage future direct usage.

---
 drivers/net/pcs/pcs-xpcs.c   | 5 ++---
 include/linux/pcs/pcs-xpcs.h | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/net/pcs/pcs-xpcs.c +2 -3
index 1ba214429e01..23223f0f8cad 100644
@@ -1224,8 +1224,8 @@ static const struct phylink_pcs_ops xpcs_phylink_ops = {
 	.pcs_link_up = xpcs_link_up,
 };
 
-struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
-			    phy_interface_t interface)
+static struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
+				   phy_interface_t interface)
 {
 	struct dw_xpcs *xpcs;
 	u32 xpcs_id;
@@ -1273,7 +1273,6 @@ struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
 
 	return ERR_PTR(ret);
 }
-EXPORT_SYMBOL_GPL(xpcs_create);
 
 void xpcs_destroy(struct dw_xpcs *xpcs)
 {
include/linux/pcs/pcs-xpcs.h +0 -2
index a99972a6d046..914e387d5387 100644
@@ -35,8 +35,6 @@ int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
 void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces);
 int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
 		    int enable);
-struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,
-			    phy_interface_t interface);
 struct dw_xpcs *xpcs_create_mdiodev(struct mii_bus *bus, int addr,
 				    phy_interface_t interface);
 void xpcs_destroy(struct dw_xpcs *xpcs);
Signature · 1 line
2.30.2
maintainer Reviewed-by Tested-by on v1 1/3
#2 lore raw

Re: [PATCH net-next 1/3] net: dsa: sja1105: allow XPCS to handle mdiodev lifetime

In reply to Russell King (Oracle)
Quoted 2 lines · Russell King (Oracle)

Put the mdiodev after xpcs_create() so that the XPCS driver can manage the lifetime of the mdiodev its using.

nitpick: "it's using"

Quoted 37 lines
---
 drivers/net/dsa/sja1105/sja1105_mdio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/sja1105/sja1105_mdio.c +1 -2
index 01f1cb719042..166fe747f70a 100644
@@ -417,6 +417,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		}
 
 		xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);
+		mdio_device_put(mdiodev);
 		if (IS_ERR(xpcs)) {
 			rc = PTR_ERR(xpcs);
 			goto out_pcs_free;
@@ -434,7 +435,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
@@ -457,7 +457,6 @@ static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
Signature · 1 line
2.30.2

So before this patch, sja1105 was using xpcs with an mdiodev refcount of 2 (a transition phase after commit 9a5d500cffdb ("net: pcs: xpcs: add xpcs_create_mdiodev()")), and now it's back to using it with a refcount of 1? okay.

maintainer Reviewed-by Tested-by on v1 2/3
#5 lore raw

Re: [PATCH net-next 2/3] net: dsa: sja1105: use xpcs_create_mdiodev()

In reply to Russell King (Oracle)
Quoted 5 lines · Russell King (Oracle)

Use the new xpcs_create_mdiodev() creator, which simplifies the creation and destruction of the mdio device associated with xpcs.

---

author reviewer
#3 lore raw

Re: [PATCH net-next 1/3] net: dsa: sja1105: allow XPCS to handle mdiodev lifetime

In reply to Vladimir Oltean
Quoted 36 lines · Vladimir Oltean
Quoted 2 lines · Russell King (Oracle)

Put the mdiodev after xpcs_create() so that the XPCS driver can manage the lifetime of the mdiodev its using.

nitpick: "it's using"

Quoted 30 lines
---
 drivers/net/dsa/sja1105/sja1105_mdio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/sja1105/sja1105_mdio.c +1 -1
index 01f1cb719042..166fe747f70a 100644
@@ -417,6 +417,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		}
 
 		xpcs = xpcs_create(mdiodev, priv->phy_mode[port]);
+		mdio_device_put(mdiodev);
 		if (IS_ERR(xpcs)) {
 			rc = PTR_ERR(xpcs);
 			goto out_pcs_free;
@@ -434,7 +435,6 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
@@ -457,7 +457,6 @@ static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)
 		if (!priv->xpcs[port])
 			continue;
 
Quoted 12 lines
Quoted 7 lines
drivers/net/dsa/sja1105/sja1105_mdio.c +0 -1
-		mdio_device_free(priv->xpcs[port]->mdiodev);
 		xpcs_destroy(priv->xpcs[port]);
 		priv->xpcs[port] = NULL;
 	}
Signature · 1 line
2.30.2

So before this patch, sja1105 was using xpcs with an mdiodev refcount of 2 (a transition phase after commit 9a5d500cffdb ("net: pcs: xpcs: add xpcs_create_mdiodev()")), and now it's back to using it with a refcount of 1? okay.

Absolutely correct, but the key thing is the owners of the refcount(s) on the object have changed.

Quoted 2 lines

Thanks.

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!
#8 lore raw
In reply to Russell King (Oracle)
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Quoted 8 lines · On Fri, 2 Jun 2023 14:58:09 +0100 you wrote:

Hi,

This series of three patches converts sja1105 to use the newly provided xpcs_create_mdiodev(), and as there become no users of xpcs_create(), removes this function from the global namespace to discourage future direct use.

[...]

Here is the summary with links:
- [net-next,1/3] net: dsa: sja1105: allow XPCS to handle mdiodev lifetime

    https://git.kernel.org/netdev/net-next/c/9607eaadba68
  - [net-next,2/3] net: dsa: sja1105: use xpcs_create_mdiodev()
    https://git.kernel.org/netdev/net-next/c/bf9a17b04c85
  - [net-next,3/3] net: pcs: xpcs: remove xpcs_create() from public view
    https://git.kernel.org/netdev/net-next/c/4739b9f3d211

You are awesome, thank you!

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