From patchwork Tue Feb 13 15:04:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 200475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp600498dyb; Tue, 13 Feb 2024 07:10:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUc6gEhLRoZzjNCoEqc/66QryA5L0omd1b4VR51E3BXsQ5ETVYPt0DfAZxpAR6jVnQpUkOmHSpciuhahmYBZvOe1dBClw== X-Google-Smtp-Source: AGHT+IFE4XHrxJlv+wbFstXwJKyopv8Uw/7fAuA6YxoI9ku6zrnhnYP0S8LWJV1AMytDMa6y2g8Z X-Received: by 2002:a05:6214:21a9:b0:68c:c602:d3f9 with SMTP id t9-20020a05621421a900b0068cc602d3f9mr10462268qvc.10.1707837012832; Tue, 13 Feb 2024 07:10:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707837012; cv=pass; d=google.com; s=arc-20160816; b=RQrMj5S/gmfm64qTixiarXAf8s9r30dJnDp/fVzs0rbVdnrpAa4VnqF36xDbYNlg+C j0wNOdxAn3pfZxFu8bptGMpKVredp8sW8/WpNSqRt0mUC7DYmE5k7anglmbRo+RWGUDs 7wT3p2RVjcX+3B8/rATnrK4hexXeN2XE1KP1kpI87LTMM8lymIgxJPTT5oBMnA+g7BI1 3oD065X9/oNdYG3pnZXuFsgfaOCOsk0PKjUBqtotWl/WfgLkJ+LRWQbMNDeQNsCqkxqT ZVdD0zn9zyVowW7NZr3HWJVvwUCiAlRovvCrrXtWofFUZiO7m9Au2hsTl3k8ox+n8Xf0 iAbg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=t/k2LZOtRfWqQWug6J8q2rLd/U7FeEJo/09riTvV4sw=; fh=5hkJJrsXqa4yzg+fEMBSMx2lgljg9w8T5GXgVq5wUlM=; b=Z+J8VU5sYbLg0c9kD3+fi97i4AS6d+CpHDdoFS2ySU+Am9vAqYKU/MyDYpuxQParYv HSNZODaezyOXhqeR0O86CB191mUnKV6P9J/ESaI++WEMO/fUOwjTlaBwV6bm1ecb1dmO kN+srg5P2EKVVIfKgkf5nnzAXoddpYUZ2PvBnbFZb/TE/bYAf6JmHehoAORmZWmd6AwU f8GGVAI8sWoMH5FdJkrKAzym0RWZaOwezdrWOZRWR4He9VzJ0LnwFhiy9ey6VIOF6ZaQ Bj7f7tudXBgUDnrok6njeYVnmOco6jaAYpj0+D/cTxJ88kQo53H4cpgSVe0XAV4dJWjH e7pw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Gufq9RHd; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com X-Forwarded-Encrypted: i=2; AJvYcCUGilKooHPYJGn3KEa7TEiUmkcIhtcJ5ArTIDxej83Y1Z/jUR89m02GUcyHEumfm6cNMP73TE1kfcjf0fxxJwOXwVf5iQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gy13-20020a056214242d00b0068d14cbf19csi3137985qvb.345.2024.02.13.07.10.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 07:10:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Gufq9RHd; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63767-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id E7F751C2858C for ; Tue, 13 Feb 2024 15:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED3DC604BA; Tue, 13 Feb 2024 15:04:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Gufq9RHd" Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (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 8765E5DF2D; Tue, 13 Feb 2024 15:04:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836684; cv=none; b=jtbzBvnGboN6Xw7rrQUOP1llmfElzAz+9oZzbG9Io3MoUA17roZagp9sp30nfDBLq+lA27+aw4vs4bTRUrvXx+7Vlow1gIoFB+6tav41xRptjt56FpPr1oOd/RSAiOrLomGyfT9cViyHkuRPqqQsZ3l/+VxBNttkBF89rybQtdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707836684; c=relaxed/simple; bh=sUJvzUCKeAXw0uB2jlHSYFSabUelDp7xZNuGeGI5Q74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q0EqRg+YGX338RflB6kDgIfXSSUmxe0HTCh+AwZy/yL34Z+/lptVT//h2/nv7oPpKhAIC+XUPrejc+R6b2y4XIU3imWqqIwpysFoj4HxOIfl2ywV1z75q9zBh2kM9SXXtlndWRPO38I55hmGf2nW/wNO6xJFlvJjiao2D+Ccnbo= 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=Gufq9RHd; arc=none smtp.client-ip=217.70.183.201 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 Received: by mail.gandi.net (Postfix) with ESMTPSA id 831761BF20A; Tue, 13 Feb 2024 15:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707836679; 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=t/k2LZOtRfWqQWug6J8q2rLd/U7FeEJo/09riTvV4sw=; b=Gufq9RHdflf2LWNQBe7Q/X7K+jAZgsXq9rlWvcBD9vKynIblwXLluOurXs/PBDwbQvw5sa cdCz83WRcTQNipvTa68TxzN84kvUi3T00UmEY8OxzT7K8RNptUcts88EP3Ylj8378GOHOx QWmHxOcHHBk33LUgaN5w61S7CXfayOzEbJNKHCeyY7x1yGJbI8MlhX4sUgceDjsL1GTCMw X0nqsy1PVFMfo3YeWY4RmD+JbG5kBNIR1/6CRZAsz9Bg85d8ZlR2Q642gfodHLQ8KoYegv KTfGNAyWc3wiazN317M81avlW9dxyMBT7UGifFDCXCQ8ddGa73Qj4PFnyUZX+g== 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 , Jonathan Corbet , =?utf-8?q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?utf-8?q?Nicol=C3=B2_Veronese?= , Simon Horman , mwojtas@chromium.org Subject: [PATCH net-next v7 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Date: Tue, 13 Feb 2024 16:04:19 +0100 Message-ID: <20240213150431.1796171-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213150431.1796171-1-maxime.chevallier@bootlin.com> References: <20240213150431.1796171-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 X-GND-Sasl: maxime.chevallier@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790796903663448320 X-GMAIL-MSGID: 1790796903663448320 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 --- V7: No changes V6: Moved an incorrectly added hunk from the previous series to patch 0003 V5: No changes V4: No changes V3: No changes 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 ed0b4ccaa6a6..a816391add12 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3385,7 +3385,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 db39dec7f247..e05013aeecc3 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -486,7 +486,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; } @@ -742,7 +742,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 9346cd44814d..0573e53b0c11 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -544,7 +544,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)