From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B61A235CB79 for ; Tue, 27 Jan 2026 13:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769521355; cv=none; b=iXIun9CKWjv7y4AEVaKy3MF69yJOuN3wkuHTGuTUUtyl+kMw3ExucpiyTj3W1v1kxLgvSa6SQWqJcONFz4pE6zUXWz6ahBtFfR8e+lrIoWdBgqhe0sY78SJKWEpkw7fBIcLKb8YoF1VOD5CvQd3DSR0tILWu5X0m/hyaZXwCEvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769521355; c=relaxed/simple; bh=6tBqceGP+0OrFdNLDH1TqykWaeGTXqOqWs0ohDU5lIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m9ZICfu9osBDXShHbLtUfhTSHRBO4lp+OplTfm8tPClVyaCh9ElXW4Vbd7yv2/hIkM1gd2T7qZCOyNLxRU4bIqgSLL/XI6oMpXZlt3hz+9YgxyMehJBjzHHq3nYIEGzkMt9N7mTya6YzDspeo7f406MOcxXiqxDxrrgL6Kv/irs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=p9QOrJy5; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="p9QOrJy5" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 1FCDF1A2A82; Tue, 27 Jan 2026 13:42:32 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id E9CC3606F5; Tue, 27 Jan 2026 13:42:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F1563119A864D; Tue, 27 Jan 2026 14:42:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1769521350; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=amp/VI8/WYNWKbm3uAB6btxp+Kn0n0uAl8u/SSDrfHk=; b=p9QOrJy5i/QK0he1QG7bI/Jz6iBOLu1my9YNChgo2bF4cKbuF9zfBbcOuIFdHePv7kFlCs nTQv6ZgyJaV0REaEF783bV43TPiAGpAYBEWihbAKHdK6SJ9t8ggiI/SlZM0h2NvrOI0ylR AMRvSA/8mdfmaWNPXO3Q5lkjGy/WpJ6l8dsfgrANAM1GdzbMUiyoK6FKi7cgwAiBO2Tx4O MFIFEihCTlv7Z7o++fQrhwnpPIYDMhPnxris4T3diuU2ST0jgey8cQAy6K+ateiCD9Cp9W CiwN8+vgCSrt4gtZCGVTa79uxKeDAcGqUIqr4v+JTypbfvpYv1SY5NwD4Txf7Q== From: Maxime Chevallier To: davem@davemloft.net, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , Heiner Kallweit Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Christophe Leroy , Herve Codina , Florian Fainelli , Vladimir Oltean , =?UTF-8?q?K=C3=B6ry=20Maincent?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Oleksij Rempel , =?UTF-8?q?Nicol=C3=B2=20Veronese?= , Simon Horman , mwojtas@chromium.org, Romain Gantois , Daniel Golle , Dimitri Fedrau Subject: [PATCH net-next 05/13] net: phy: Create SFP phy_port before registering usptream Date: Tue, 27 Jan 2026 14:41:53 +0100 Message-ID: <20260127134202.8208-6-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260127134202.8208-1-maxime.chevallier@bootlin.com> References: <20260127134202.8208-1-maxime.chevallier@bootlin.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 When dealing with PHY-driver 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 --- drivers/net/phy/phy_device.c | 40 +++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8a3eb1839a3d..819c9e81bdef 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1665,13 +1665,13 @@ static void phy_del_port(struct phy_device *phydev, struct phy_port *port) phydev->n_ports--; } -static int phy_setup_sfp_port(struct phy_device *phydev) +static struct phy_port *phy_setup_sfp_port(struct phy_device *phydev) { struct phy_port *port = phy_port_alloc(); int ret; if (!port) - return -ENOMEM; + return ERR_PTR(-ENOMEM); port->parent_type = PHY_PORT_PHY; port->phy = phydev; @@ -1686,10 +1686,12 @@ static int phy_setup_sfp_port(struct phy_device *phydev) * when attaching the port to the phydev. */ ret = phy_add_port(phydev, port); - if (ret) + if (ret) { phy_port_destroy(port); + return ERR_PTR(ret); + } - return ret; + return port; } /** @@ -1698,22 +1700,32 @@ 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) + return 0; - if (phydev->mdio.dev.fwnode) { - bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode); - if (IS_ERR(bus)) - return PTR_ERR(bus); + 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) + phy_del_port(phydev, port); return ret; } -- 2.49.0