[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <aYI1zd6Iddcdt6xc@horms.kernel.org>
Date: Tue, 3 Feb 2026 17:52:13 +0000
From: Simon Horman <horms@...nel.org>
To: Maxime Chevallier <maxime.chevallier@...tlin.com>
Cc: davem@...emloft.net, Andrew Lunn <andrew@...n.ch>,
Jakub Kicinski <kuba@...nel.org>,
Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>,
Russell King <linux@...linux.org.uk>,
Heiner Kallweit <hkallweit1@...il.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, thomas.petazzoni@...tlin.com,
Christophe Leroy <christophe.leroy@...roup.eu>,
Herve Codina <herve.codina@...tlin.com>,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <vladimir.oltean@....com>,
Köry Maincent <kory.maincent@...tlin.com>,
Marek Behún <kabel@...nel.org>,
Oleksij Rempel <o.rempel@...gutronix.de>,
Nicolò Veronese <nicveronese@...il.com>,
mwojtas@...omium.org, Romain Gantois <romain.gantois@...tlin.com>,
Daniel Golle <daniel@...rotopia.org>,
Dimitri Fedrau <dimitri.fedrau@...bherr.com>
Subject: Re: [PATCH net-next v3 05/11] net: phy: Create SFP phy_port before
registering usptream
On Sun, Feb 01, 2026 at 04:12:42PM +0100, Maxime Chevallier wrote:
> When dealing with PHY-driven SFP, we create a phy_port representing the
> SFP bus when we know we have such a bus.
>
> We can move the port creation before registering the sfp upstream ops,
> as long as we know the SFP bus is there. This will allow passing the
> phy_port along with the upstream information to the SFP bus.
>
> Signed-off-by: Maxime Chevallier <maxime.chevallier@...tlin.com>
...
> @@ -1698,22 +1700,34 @@ static int phy_setup_sfp_port(struct phy_device *phydev)
> */
> static int phy_sfp_probe(struct phy_device *phydev)
> {
> + struct phy_port *port;
> struct sfp_bus *bus;
> - int ret = 0;
> + int ret;
>
> - if (phydev->mdio.dev.fwnode) {
> - bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode);
> - if (IS_ERR(bus))
> - return PTR_ERR(bus);
> + if (!phydev->mdio.dev.fwnode)
> + return 0;
> +
> + bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode);
> + if (IS_ERR(bus))
> + return PTR_ERR(bus);
>
> - phydev->sfp_bus = bus;
> + phydev->sfp_bus = bus;
>
> - ret = sfp_bus_add_upstream(bus, phydev, &sfp_phydev_ops);
> - sfp_bus_put(bus);
> + if (bus) {
> + port = phy_setup_sfp_port(phydev);
> + if (IS_ERR(port)) {
> + sfp_bus_put(bus);
> + return PTR_ERR(port);
> + }
> }
>
> - if (!ret && phydev->sfp_bus)
> - ret = phy_setup_sfp_port(phydev);
> + ret = sfp_bus_add_upstream(bus, phydev, &sfp_phydev_ops);
> + sfp_bus_put(bus);
> +
> + if (ret && port) {
Hi Maxime,
If bus is NULL then port will not be set here.
Flagged by Smatch.
> + phy_del_port(phydev, port);
> + phy_port_destroy(port);
> + }
>
> return ret;
> }
> --
> 2.49.0
>
Powered by blists - more mailing lists