From patchwork Wed Aug 21 15:09:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 13771761 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 442E8C52D6F for ; Wed, 21 Aug 2024 15:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=G0k84ef5zh0XlFis0UubIbaXwICxOs9PFCwUXJKvgiY=; b=xbmQE23GL1Vmghc7gI1d9Gv84b pWkrUQbm7MXRNvf04kdYTT4C4loEot1cTmW9GnLBbGv/vE3S1dWhFtLvKK+7up0yt5Yvi+tbEFqgE xwtwXfeh//CsWr58O1Mc4/8TPVg86t2KEadsZ9g1N+fIfkVxn8lM1Mdhf8hurbdVluYPxSlktScr7 +AJsxudHka+pjSBaeBBNcgRokZTMdPMzNTmHbx85UWMIiMsFdQGLDH+8eWJtAP9V93CJy+LpPRmKN LDrCxEOizmwAXCXYj1Lb7Y3/mulVszhimJMYq9JvHxMKm2PLZhXuVtfTlBvyiNi1Y+FoUcWBvyh9r VUYxAJCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgn0j-00000009Rml-2fyl; Wed, 21 Aug 2024 15:12:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgmyg-00000009RBu-0w3r for linux-arm-kernel@bombadil.infradead.org; Wed, 21 Aug 2024 15:10:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=G0k84ef5zh0XlFis0UubIbaXwICxOs9PFCwUXJKvgiY=; b=T2B6Pc48qQcP1zNrsnIgojIot0 E0IRMsC5IpmN0LdVqTS3nIofyk1OV/HchQApDt8v7zGDkJaK/ircIA0OrxPD/nR0feSZ0Dydg7iXj t7Lk4iet6qUo34j8Su4Z3KqdCVACi+O8kMk8Wnim/D2blp6qRSyrtAPqeh+qW/7dagaxfyRSFy11O m+Y5XG63x/RUHdobn19i7INIKvkS7PhRgrK/ofbwBvl03LdlDhb/mtiJuOIs/Va71lef2KgCMspTS qVO7M06OioOTtKO4SgaqVEzDv/j7XePRDHjI1kYZOlX5auFTtL8+P6Ft4LStkFEIjzArz7aD39l/d zN+L/9zQ==; Received: from relay2-d.mail.gandi.net ([2001:4b98:dc4:8::222]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgmyc-00000009dmo-3Vk6 for linux-arm-kernel@lists.infradead.org; Wed, 21 Aug 2024 15:10:24 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 661D84000B; Wed, 21 Aug 2024 15:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724253018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G0k84ef5zh0XlFis0UubIbaXwICxOs9PFCwUXJKvgiY=; b=HpB5OZoIwQGdMKXW3st/1Mpm8D/zFnEjw0mghE2u2iGoy+8Vs9Fq6onQVFKVBW6+KZVPxJ 5BLfNGyXMt4LJp8uT3UPJl9QlKF8hy2Z18yMJZ/MQlRWPgGpxUnGUL78qsLZroEEi4M47T oxPeuxRvHmaqtj4yyWa8YFkgyghyA26NptUGp6YpV3wU7qqGGh3oue+wMGEbXUmq7c2W+I YUzAQn0QTaBBGE8Meoe2dpCD7qKN5hpSYVbRx563OTeiDjI6omU5oq355dJirAEZLk0oB5 wxLBCTxJ83m9N/7H7VmPTFmx2jFK1ygLTJpUdAtHXmC74sup4GO4JJu60LI64w== From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Herve Codina , Florian Fainelli , Heiner Kallweit , Vladimir Oltean , =?utf-8?q?K=C3=B6ry_Maincent?= , Jesse Brandeburg , =?utf-8?q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?utf-8?q?Nicol=C3=B2_Veronese?= , Simon Horman , mwojtas@chromium.org, Nathan Chancellor , Antoine Tenart , Marc Kleine-Budde , Dan Carpenter , Romain Gantois Subject: [PATCH net-next v18 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Date: Wed, 21 Aug 2024 17:09:56 +0200 Message-ID: <20240821151009.1681151-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240821151009.1681151-1-maxime.chevallier@bootlin.com> References: <20240821151009.1681151-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: maxime.chevallier@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240821_161023_025529_F4AD0B7C X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Pass the phy_device as a parameter to the sfp upstream .disconnect_phy operation. This is preparatory work to help track phy devices across a net_device's link. Signed-off-by: Maxime Chevallier Reviewed-by: Andrew Lunn Reviewed-by: Christophe Leroy Tested-by: Christophe Leroy --- drivers/net/phy/phylink.c | 3 ++- drivers/net/phy/sfp-bus.c | 4 ++-- include/linux/sfp.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 51c526d227fa..ab4e9fc03017 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3423,7 +3423,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) return ret; } -static void phylink_sfp_disconnect_phy(void *upstream) +static void phylink_sfp_disconnect_phy(void *upstream, + struct phy_device *phydev) { phylink_disconnect_phy(upstream); } diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index 2f44fc51848f..56953e66bb7b 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -487,7 +487,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus) bus->socket_ops->stop(bus->sfp); bus->socket_ops->detach(bus->sfp); if (bus->phydev && ops && ops->disconnect_phy) - ops->disconnect_phy(bus->upstream); + ops->disconnect_phy(bus->upstream, bus->phydev); } bus->registered = false; } @@ -743,7 +743,7 @@ void sfp_remove_phy(struct sfp_bus *bus) const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus); if (ops && ops->disconnect_phy) - ops->disconnect_phy(bus->upstream); + ops->disconnect_phy(bus->upstream, bus->phydev); bus->phydev = NULL; } EXPORT_SYMBOL_GPL(sfp_remove_phy); diff --git a/include/linux/sfp.h b/include/linux/sfp.h index b14be59550e3..54abb4d22b2e 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -550,7 +550,7 @@ struct sfp_upstream_ops { void (*link_down)(void *priv); void (*link_up)(void *priv); int (*connect_phy)(void *priv, struct phy_device *); - void (*disconnect_phy)(void *priv); + void (*disconnect_phy)(void *priv, struct phy_device *); }; #if IS_ENABLED(CONFIG_SFP)