From nobody Mon Feb 9 13:01:28 2026 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 9F8EA35C1AF for ; Tue, 27 Jan 2026 13:42:35 +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=1769521357; cv=none; b=sEtBm43rtkaqtYbGx5QuVEO2P1t3WWkISHU8fVbJ2RerIVktLoTrriPp4JFyee0zky9UalXnXQtqUTOoLR4l1jtGbv8u4D+g0vBFCtqK+O26H7UTmL0Xz+fWXWQlcnkB5VUcTPMxwSpwLmccJ+BlwP4CtvcVczgg8mHCUlG93yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769521357; c=relaxed/simple; bh=AxbRNSV+MGlIrdbZNQx3WZxbKnpHL7fzSnW3Fnkk3g4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tDOuP3angEClCw6VH44te84hROIjpHwA+PQsSDWu55qCzAf0riMjelp89fPJjvXVRE2Me28oWpiN1Y3rRJ3y/vcc/h8KL3yaBqA8odk2yw8aQGNc7ZHKLohg6vYDwoeyfbQhfhfE+AcA0ALkvgQuvGklOsJ8cIP2EPwndfLMz7s= 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=pPFfg3wa; 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="pPFfg3wa" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 5476A4E422D4; Tue, 27 Jan 2026 13:42:34 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2A487606F5; Tue, 27 Jan 2026 13:42:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3D785119A8687; Tue, 27 Jan 2026 14:42:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1769521353; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=8lrGzf6PbbtMSnb6kURa7INkbEyB0GSQ5wN3CCFsZEA=; b=pPFfg3wa6azN6ydEt7rt0orYcnE9rBJszS/eId6K5h3KKdmLdOFsrt6PljzOitrNn8v5y3 wgv6MLRbICCPQCTjAVhDzWcB1jX1NFJgM9YMnOqKvuxd9VdH2O1wxQwlQOP1MdAHYEhqt3 Pe5XZo1JAEeTW9fSLnlDwjNswpiCiiP8H9LTUik8f4E4KGJi8YEth8K4I+0VzWoOMaDORN Vsu7yN6rJVeQNnAu4M8qAetSaq+0j8JT8XrOSEk4rfygSrxNLZT/dyAU/g2PmbyMiKB7Vp 18DeULMwdtT+uBIe2pZu9IpUP7uqAuHwfuSQqZ5Uv8usDobqx3k2cfsUccvbOQ== 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 06/13] net: sfp: Add a sfp-bus ops when connecting a module without PHY Date: Tue, 27 Jan 2026 14:41:54 +0100 Message-ID: <20260127134202.8208-7-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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" The SFP bus infrastructure notifies its upstream when a PHY device was discovered on the module. However, we don't have any indication when a module with no PHY was inserted, except for the .insert() and .start() notifications. We want to keep track of the SFP module's capabilities using phy_port. When the module contains an embedded PHY, the PHY driver will expose a phy_port for it. However when there's no PHY, we have no hook to populate the phy_port, so let's introduce one. It is called when we have parsed the module's caps, applied the fixups, tried and failed to probe for a PHY. This will allow the bus' upstream to create the corresponding port, and register it to the topology. Signed-off-by: Maxime Chevallier --- drivers/net/phy/sfp-bus.c | 20 ++++++++++++++++++++ drivers/net/phy/sfp.c | 12 ++++++++++++ drivers/net/phy/sfp.h | 2 ++ include/linux/sfp.h | 5 +++++ 4 files changed, 39 insertions(+) diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index b945d75966d5..a3d9e28badd0 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -753,6 +753,26 @@ void sfp_remove_phy(struct sfp_bus *bus) } EXPORT_SYMBOL_GPL(sfp_remove_phy); =20 +int sfp_module_connect_nophy(struct sfp_bus *bus) +{ + const struct sfp_upstream_ops *ops =3D sfp_get_upstream_ops(bus); + + if (ops && ops->connect_nophy) + return ops->connect_nophy(bus->upstream); + + return 0; +} +EXPORT_SYMBOL_GPL(sfp_module_connect_nophy); + +void sfp_module_disconnect_nophy(struct sfp_bus *bus) +{ + const struct sfp_upstream_ops *ops =3D sfp_get_upstream_ops(bus); + + if (ops && ops->disconnect_nophy) + ops->disconnect_nophy(bus->upstream); +} +EXPORT_SYMBOL_GPL(sfp_module_disconnect_nophy); + void sfp_link_up(struct sfp_bus *bus) { const struct sfp_upstream_ops *ops =3D sfp_get_upstream_ops(bus); diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 47f095bd91ce..0f6357a98787 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -1875,6 +1875,8 @@ static void sfp_sm_mod_next(struct sfp *sfp, unsigned= int state, =20 static void sfp_sm_phy_detach(struct sfp *sfp) { + if (!sfp->mod_phy) + sfp_module_disconnect_nophy(sfp->sfp_bus); sfp_remove_phy(sfp->sfp_bus); phy_device_remove(sfp->mod_phy); phy_device_free(sfp->mod_phy); @@ -1918,6 +1920,11 @@ static int sfp_sm_probe_phy(struct sfp *sfp, int add= r, bool is_c45) return 0; } =20 +static int sfp_sm_connect_nophy(struct sfp *sfp) +{ + return sfp_module_connect_nophy(sfp->sfp_bus); +} + static void sfp_sm_link_up(struct sfp *sfp) { sfp_link_up(sfp->sfp_bus); @@ -2749,6 +2756,11 @@ static void sfp_sm_main(struct sfp *sfp, unsigned in= t event) sfp_sm_next(sfp, SFP_S_FAIL, 0); break; } + if (!sfp->mod_phy) { + ret =3D sfp_sm_connect_nophy(sfp); + if (ret) + sfp_sm_next(sfp, SFP_S_FAIL, 0); + } if (sfp_module_start(sfp->sfp_bus)) { sfp_sm_next(sfp, SFP_S_FAIL, 0); break; diff --git a/drivers/net/phy/sfp.h b/drivers/net/phy/sfp.h index 879dff7afe6a..02f3814aac84 100644 --- a/drivers/net/phy/sfp.h +++ b/drivers/net/phy/sfp.h @@ -37,6 +37,8 @@ int sfp_module_insert(struct sfp_bus *bus, const struct s= fp_eeprom_id *id, void sfp_module_remove(struct sfp_bus *bus); int sfp_module_start(struct sfp_bus *bus); void sfp_module_stop(struct sfp_bus *bus); +int sfp_module_connect_nophy(struct sfp_bus *bus); +void sfp_module_disconnect_nophy(struct sfp_bus *bus); struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp, const struct sfp_socket_ops *ops); void sfp_unregister_socket(struct sfp_bus *bus); diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 5c71945a5e4d..20c9f66c1080 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -561,6 +561,9 @@ struct sfp_module_caps { * on the module. * @disconnect_phy: called when a module with an I2C accessible PHY has * been removed. + * @connect_nophy: called when it was established that the connected module + * doesn't habe an I2C accessible. + * @disconnect_nophy: called when the PHY-less module has been removed. */ struct sfp_upstream_ops { void (*attach)(void *priv, struct sfp_bus *bus); @@ -573,6 +576,8 @@ struct sfp_upstream_ops { void (*link_up)(void *priv); int (*connect_phy)(void *priv, struct phy_device *); void (*disconnect_phy)(void *priv, struct phy_device *); + int (*connect_nophy)(void *priv); + void (*disconnect_nophy)(void *priv); }; =20 #if IS_ENABLED(CONFIG_SFP) --=20 2.49.0