From patchwork Thu Dec 21 18:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 182374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp586659dyi; Thu, 21 Dec 2023 10:02:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0HHVDR68O7PHzo5Dh1BBrwC4RwjDNms6HBZbnMweogz5CyW4A9P1/XvG/2QfTaCxj2wiT X-Received: by 2002:ac8:7d84:0:b0:425:4043:96d8 with SMTP id c4-20020ac87d84000000b00425404396d8mr119355qtd.101.1703181746982; Thu, 21 Dec 2023 10:02:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703181746; cv=none; d=google.com; s=arc-20160816; b=jV5hqOgbkGtY/ge30TBN5IQo9zLx3gYe3DH+SrYG9sLiE5lI87zTFJjc2yfBoKMQ5p n99Mo8o+0p4vqwBn8LfeytVg0m4NTXCgDeDQbaRMy0U8ebZrvkAQQ7iJFSvQLi9Ctzbl lF+finQeG+AMvnsM8yLjBmxYyVKK46pjTUzdikKzxd0wFXyjG99RIOiLkFMAUrKdHNLM 323F7wDVnogryGCd1xFP9m9OvUXwnMrYXAm1+w39EQ3SGGIhpPIXbFtvBuy84leB2X3h 4MRbVYJs51h/0guNWn9VbJBWrA/jmvk/hab0S/GI2Z18TvAhTg21l9LSHgIvi356QJ6u G0qg== ARC-Message-Signature: i=1; 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=xPqx0OEQXus59iwv9XtKV+tNtHOhTw4nBV+Sv6aVjh4=; fh=d3Krop4IPE3x6nBOvh3GY5QHg6bS91zVnQiH59I3hyM=; b=KopJyyl7EN+Nb+IIqvYHDI3IAXDtg8oIKj4Kmh8lDWZg2eWptzniWZW05SHsDE5Uiw wbJdK9A4VSquDLvBZa46sSjkEG54sLyLhKaGBjAnuQ/DnKvJPVrR7rzwen2Q0Pn0x1Yk YNV4b1vrwFvydgmxQRrPMeCEHgIP/mdjOp94bQACiUNNx/Z6rTwWS0HpIigSzl5UHKw5 g1SaaiC2mJvC+1gvrCJqp5IZ+Jyqz5AjOEcO/QyK66w9L0PHzH1OPwYXwpm6fmVJGdfe Y8s3d3c2TfBPjjDarsZsAf6A+QZ/l0VGqRNNkn7y8RRN6uxtJY26P7S/5uWeYT4LWH9D 4bFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=No+OfNxH; spf=pass (google.com: domain of linux-kernel+bounces-8887-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8887-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v35-20020a05622a18a300b0041212556418si2656995qtc.658.2023.12.21.10.02.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 10:02:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8887-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=No+OfNxH; spf=pass (google.com: domain of linux-kernel+bounces-8887-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8887-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 9FEC51C240CA for ; Thu, 21 Dec 2023 18:02:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7CF9673191; Thu, 21 Dec 2023 18:01:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="No+OfNxH" X-Original-To: linux-kernel@vger.kernel.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (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 C334A6350B; Thu, 21 Dec 2023 18:00:56 +0000 (UTC) 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 AEFF81C0007; Thu, 21 Dec 2023 18:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1703181654; 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=xPqx0OEQXus59iwv9XtKV+tNtHOhTw4nBV+Sv6aVjh4=; b=No+OfNxHY0T2RxpPgajCLss61f/DIaYN/7ijdGBpDptoyp154Jn3PmBXmXHct5+YaUnr2N E9TKhvFu5aKfEADWcQudIb5mXlPM681kDP6dvNzed8uHIRjSi22NIFWniVnD44w1Qb3bcn Cz6l6GNDR4plwHnk5l5NwlcyZD4cU09L1tkEFUBeKIzZMVCvgZD+RR5cYRoNTExmt8VHOk 8VWLNPBei4Y4mLIjZ6BnocLVhp+llTJvbnH9bKl0ZlOVZA83kKuCor8UBznQdl3woK1iaj sUx6sxamtrkyoq95uTiENF/F1nZ1mrDyqyWBgHZjNTHfb0EnvNbnXeGEJ3sIgw== 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 Subject: [PATCH net-next v5 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Date: Thu, 21 Dec 2023 19:00:35 +0100 Message-ID: <20231221180047.1924733-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221180047.1924733-1-maxime.chevallier@bootlin.com> References: <20231221180047.1924733-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: 1785915503218392243 X-GMAIL-MSGID: 1785915503218392243 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 --- V5: No changes V4: No changes V3: No changes drivers/net/phy/phy_device.c | 8 ++++++++ drivers/net/phy/phylink.c | 3 ++- drivers/net/phy/sfp-bus.c | 4 ++-- include/linux/sfp.h | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index d7c0812bd107..aad78e3f7894 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -266,6 +266,14 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev) static struct phy_driver genphy_driver; +static struct phy_link_topology *phy_get_link_topology(struct phy_device *phydev) +{ + if (phydev->attached_dev) + return &phydev->attached_dev->link_topo; + + return NULL; +} + static LIST_HEAD(phy_fixup_list); static DEFINE_MUTEX(phy_fixup_lock); diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 298dfd6982a5..3d25a4a6212b 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3319,7 +3319,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 6fa679b36290..3a86c41e1235 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)