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 292E23B5835 for ; Wed, 4 Mar 2026 14:55:14 +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=1772636115; cv=none; b=uT3XtSN3vUKyiAPI3BTRKyBSo8N/dITptkd4SboG652BO0GGrZZ0C8RUs0MpkKc4zTtOfQ1pEs5dF66wJx3Nyr2xB0wmwnd6ZeHM/vhwnSa0loWzWAOPE3kj17Y7lvSAp+kRFaiBogv67w00Jez1x6DSAqHZ8kasVCx4h13RcfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772636115; c=relaxed/simple; bh=o5a4b5GZ+b7WqBlGtwecJlKdXSEn3+f3E3I5+dOianM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hGgIWbGLiw96JyODi23QMLjXpSP4QGpjZeaHk3G9+DTVccC0kSRW7g6ERpUIpSTbDIeTvnboQfS6z+mDuRadNcjNvKOnv+3TP9hIZnkvRsChwiR/54SJ49Xjfk4rlbcMqUDBl8bdHP6X5YXYUmonOw+XI1lGc3mdUax4B+JHSGY= 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=GAJ9zL2E; 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="GAJ9zL2E" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id D5A924E42540; Wed, 4 Mar 2026 14:55:12 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id A92C65FF5C; Wed, 4 Mar 2026 14:55:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id CA469103697DE; Wed, 4 Mar 2026 15:55:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1772636111; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=NYgSeGx5qltur8XPJqvU4FsFfltp1J1YBrmdOidXGOI=; b=GAJ9zL2Eii2u6Aaph9q8j+6k2OScQn0UpiKm19ihfjbWFbOKhMWOF0D98m86PLYT+6PMlp ZCSuJDnN04wwtVCw1qhv1lfel1wo2AhByU3KPH1rbqp5CQQgjLxigpbr37lm1gyR/Cp7Hg J5U/Hx8tYej6nx9tJSI2CHIEur+cUg1OEkoZrmecKjwO0FkETxEktP659xMqeGotbX6YhI kv+d238SgaotrkSRTTd/kgxH9hP6XbcHOtsoEV0uhR1/6ygs9+FnhE786V5h2NoDqc++3S Gz/MJ8PJi9xDMXi0zZGpkJS2IaD0qs7rp1J+2jsKgAoumGIlPw6qLlsSwlPmpw== 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 v6 06/10] net: phylink: Represent PHY-less SFP modules with phy_port Date: Wed, 4 Mar 2026 15:54:37 +0100 Message-ID: <20260304145444.442334-7-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260304145444.442334-1-maxime.chevallier@bootlin.com> References: <20260304145444.442334-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 Let phylink handle the phy_port for PHY-less modules, and register it to the topology. Signed-off-by: Maxime Chevallier --- drivers/net/phy/phylink.c | 71 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 3212913c9897..79f7811dec22 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -96,6 +96,7 @@ struct phylink { __ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support); u8 sfp_port; struct phy_port *sfp_bus_port; + struct phy_port *mod_port; struct eee_config eee_cfg; @@ -1783,10 +1784,21 @@ static int phylink_create_sfp_port(struct phylink *pl) ret = phy_link_topo_add_port(pl->netdev, port); if (ret) - phy_port_destroy(port); - else - pl->sfp_bus_port = port; + goto out_destroy_port; + + pl->sfp_bus_port = port; + + if (pl->mod_port) { + ret = phy_link_topo_add_port(pl->netdev, pl->mod_port); + if (ret) + goto out_del_bus_port; + } + return 0; +out_del_bus_port: + phy_link_topo_del_port(pl->netdev, port); +out_destroy_port: + phy_port_destroy(port); return ret; } @@ -3919,14 +3931,65 @@ static void phylink_sfp_module_remove(void *upstream) phy_interface_zero(pl->sfp_interfaces); } +static int phylink_add_sfp_mod_port(struct phylink *pl) +{ + const struct sfp_module_caps *caps; + struct phy_port *port; + int ret = 0; + + if (!pl->sfp_bus_port) + return 0; + + /* Create mod port */ + port = phy_port_alloc(); + if (!port) + return -ENOMEM; + + port->active = true; + + caps = sfp_get_module_caps(pl->sfp_bus); + + phy_caps_linkmode_filter_ifaces(port->supported, caps->link_modes, + pl->sfp_bus_port->interfaces); + + if (pl->netdev) { + ret = phy_link_topo_add_port(pl->netdev, port); + if (ret) { + phy_port_destroy(port); + return ret; + } + } + + pl->mod_port = port; + + return 0; +} + +static void phylink_del_sfp_mod_port(struct phylink *pl) +{ + if (!pl->mod_port) + return; + + if (pl->netdev) + phy_link_topo_del_port(pl->netdev, pl->mod_port); + + phy_port_destroy(pl->mod_port); + pl->mod_port = NULL; +} + static int phylink_sfp_module_start(void *upstream) { struct phylink *pl = upstream; + int ret; /* If this SFP module has a PHY, start the PHY now. */ if (pl->phydev) { phy_start(pl->phydev); return 0; + } else { + ret = phylink_add_sfp_mod_port(pl); + if (ret) + return ret; } /* If the module may have a PHY but we didn't detect one we @@ -3945,6 +4008,8 @@ static void phylink_sfp_module_stop(void *upstream) /* If this SFP module has a PHY, stop it. */ if (pl->phydev) phy_stop(pl->phydev); + else + phylink_del_sfp_mod_port(pl); } static void phylink_sfp_link_down(void *upstream) -- 2.49.0