From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (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 E08F34AD7D5 for ; Wed, 2 Sep 2026 21:22:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788384147; cv=none; b=Zv5V1NspFlMzDmmkpjKfo0ruzK+F/Gak6Jn821N1jM60uIBMPqXFOTK7cQmjRjdw0IDjN31V+evrx7cP9ZCrCeg+MWw2nHbe2HMpZXklw1kt9S5AyE+wU7lQtiTamXdYUpV2EYKGpR4FGhDlF7l73IW7cY6QrJ7pGizTs1sZ3gU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788384147; c=relaxed/simple; bh=FCLSL0X7no4kVHnaLjWEGe8J4/pSsX2RFDXLNaQFirQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CHI3oe9ts0nT8LUueU9jLxVM8uNuacJK3GXPAMAUMVHo2Q02q3UCp4HiNboY7SaQYhTorMAkOnXrpsVIcBAvKa4Fp+Ct43UzQ/9iJZByziP1oMLu1IBuPTIfKZPo0GTO50SksU/TIvqRpSkz9nzcfVy9eqon3La3l/ixXZ0+pkU= 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=MvtkL2Ix; arc=none smtp.client-ip=185.246.85.4 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="MvtkL2Ix" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 9FE074E414D3; Wed, 2 Sep 2026 21:22:21 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 729626053C; Wed, 2 Sep 2026 21:22:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3E2CE11C798E5; Wed, 2 Sep 2026 23:22:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788384136; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=o+1CUaJKROX5TjGP3eIWjXpP8w+CAeUdsZhpoz/2VJk=; b=MvtkL2IxPUWgqjdphUzM6Jj64VX9w+IEAs8SMgekI8Vr9yqRTOFrncFG4skac4j7gAWKia Exk8AOBKOmK5styb6x0StvMEPM3WlERwGQIEUy+V/thtIACB9sK0LBjArTXwEeufVd0AtY QfstmPPbu/wpj5Ecw4Jsk2M7EMPa8OXebfLf4MxcMuMhPkFsxwPfIJYERDfu+c0CqHBv0G cUXSkVHZkZAbBjTmtRue3LA1UEBYo25nsN3RJQhZ31X9zuS+6hXQ9HKR74dKU5OaCebPQc G/1oJtHcG3E7HAX9fxLg3DV1I84Rk3sio1g4LO3MR2ul9M16y+AxXw3VgfYr0A== 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 , Frank Wunderlich , Pietro Ameruoso Subject: [PATCH net-next v16 04/10] net: phy: Create SFP phy_port before registering upstream Date: Wed, 2 Sep 2026 23:21:28 +0200 Message-ID: <20260902212135.1805948-5-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260902212135.1805948-1-maxime.chevallier@bootlin.com> References: <20260902212135.1805948-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-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. Reviewed-by: Andrew Lunn Signed-off-by: Maxime Chevallier --- drivers/net/phy/phy_device.c | 58 +++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 1489be1a3b71..11da92dc5af7 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1676,13 +1676,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; @@ -1697,10 +1697,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; } /** @@ -1709,30 +1711,46 @@ static int phy_setup_sfp_port(struct phy_device *phydev) */ static int phy_sfp_probe(struct phy_device *phydev) { + struct phy_port *port = NULL; 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; - phydev->sfp_bus = bus; + bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode); + if (IS_ERR(bus)) + return PTR_ERR(bus); - ret = sfp_bus_add_upstream(bus, phydev, &sfp_phydev_ops); - sfp_bus_put(bus); + phydev->sfp_bus = bus; - if (ret) - phydev->sfp_bus = NULL; + if (bus) { + port = phy_setup_sfp_port(phydev); + if (IS_ERR(port)) { + ret = PTR_ERR(port); + goto out_sfp; + } } - if (!ret && phydev->sfp_bus) { - ret = phy_setup_sfp_port(phydev); - if (ret) { - sfp_bus_del_upstream(phydev->sfp_bus); - phydev->sfp_bus = NULL; - } + ret = sfp_bus_add_upstream(bus, phydev, &sfp_phydev_ops); + if (ret) + goto out_port; + + /* sfp_bus_add_upstream() grabs a ref to the sfp bus on success, it's + * safe to release it now. + */ + sfp_bus_put(bus); + + return ret; + +out_port: + if (port) { + phy_del_port(phydev, port); + phy_port_destroy(port); } +out_sfp: + sfp_bus_put(bus); + phydev->sfp_bus = NULL; return ret; } -- 2.55.0