From patchwork Tue Feb 20 18:42:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 203749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp596089dyc; Tue, 20 Feb 2024 10:43:38 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW3MXpQKbrfu7dWpPyLMvk3fBnaoETDQytSIdtDo9BJwWQhulIePJ9mu6k9A1WjGTiiPd1osswfB3c2ODwENHzTqQGZ8w== X-Google-Smtp-Source: AGHT+IFAX0KOEhs/eMXY9lnTbzEzJFWwcNQ93boEnjYVfnDKTPywjtH9EG4VrzPGMs5DDOFjOPtw X-Received: by 2002:a37:de07:0:b0:785:b247:e723 with SMTP id h7-20020a37de07000000b00785b247e723mr14763468qkj.40.1708454618260; Tue, 20 Feb 2024 10:43:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708454618; cv=pass; d=google.com; s=arc-20160816; b=ZtSppkw4fRBLaWQvftyrUmgAJLBKL00jfrcDh8Rxq9pgl7UUyfkhJqINsJNRJEkGo0 KogXZaNnWPNow3lpDK8M1SzJthUC+3Oah/F7e4kbifPkjI5VDKHnnv0VgOvf2owHFPAb M5DgpmobQT+cOYndBV+bqOFHM/qMELfLUgai5arBTxvhng4fEzg1m/87+G2MCyq0/mka TvcnomXJbDyaj0oER693FV6lnKFaN2FvtDX1oDM06QGBJKeRqyOnEsgF0T67Az+Gpksk LQ5A3u0CZd7AHnjlmOqnua+6MOyiLIsDAI4YYGqIyOhm+lioFP27ZRDom8z4Dvbc9iuT NY4g== 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=VuI2b8n8iPWxqJXWqnhoi8+2FDyANXSShmT3khK44oo=; fh=1vUu/d1GTjraph6G+ET+Z0z13QVrf6oL/IrrK9zaTF8=; b=MrEz5pZxbh/L2lXXVr9J4YevzSOzCYy+qNBGJa+ULi5yhXT7wGJMjLPrb4reCs5hV8 evaOD1iegOn+cLbHbZa8GcBozO2NwhS/jyBhgONzXxguDKIjXJR6CaR2TldQiLIy39de EtX4NKE6EMYS82Qs77onnk6vPCD2vivnhAKnq/mSh7nFmIyfeJ8HGBe8QZS4LsvAxhyG TZf0SE6DOd2ZRz62KLO7I8uGRdKocfSoUZOHwVfJS9njz8+FCj2MhGsVwFmN9g8IbAJ4 tScu3oUVcrOwpUNSaEE3mamlVe5m2/x1WTtk9AupTstTvgh2O2ydw1NcNosUMuLZyI8V TlWA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=BBZvwM35; 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-73527-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73527-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. [147.75.199.223]) by mx.google.com with ESMTPS id pj5-20020a05620a1d8500b007871f998409si9262589qkn.695.2024.02.20.10.43.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 10:43:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73527-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=BBZvwM35; 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-73527-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73527-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 114631C2212B for ; Tue, 20 Feb 2024 18:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BDE814AD19; Tue, 20 Feb 2024 18:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="BBZvwM35" Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 0A31312AAE8; Tue, 20 Feb 2024 18:42:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454550; cv=none; b=Z8gDngSeLZ8Ns0/tIktCLGvykGqj74mVLGIeVsI9CA/CFhmunSIgGVg6F8YpHefMN73Sn0CmQXMStnOTzDoQ7QtwNoYCBVuICqVWROuOGXhcwa861MBbRGpdfL+X3iLX2wLwjLIrlzx+ixDYa4lGlnmy6uikYtGCrh8W/ofuQvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708454550; c=relaxed/simple; bh=AsBxN3W2ETyLUf5KndFOJrVCuQCmIU39hQOzYTzFwag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mLDgQqe/2/JPw0KdQqVDARK9C7rzmyqtVnOj4OPjnd5ERBYyF/CeJqTHG2C7diJH28nWnKq9MkHM7VX+XbYuPGZyJILxE3MbTK8etPUS32rS9rC/sIW4Ooq4l/JbrEjNfp1rybdha3D+X9BD/hKgcqEOC/h0BxVUkG3dynSVVQ8= 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=BBZvwM35; arc=none smtp.client-ip=217.70.183.195 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 0422460005; Tue, 20 Feb 2024 18:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708454545; 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=VuI2b8n8iPWxqJXWqnhoi8+2FDyANXSShmT3khK44oo=; b=BBZvwM35hFY+KVK3FavBSvEFhZDpeZ8Xu0vrZ6GqnP/De8HWyHtULohTzLf/d8EKXYdbmo XwpNT8Mv/Q4DLKuEgqIPztzOebUZmBs8E838MM1aC4EUc5IhPFHwA0YuXsVuZ74w06Z5NL 2ildWDu0Fs/H9NjvBr+cfch50aSDwojLwbnZJ6aNkS+ep3sHB9/uhXcWNGtlWc8qLYfbOl PRIfLw/dU74HY4sh4P7YusB3VwaiiD9hOVZ+yOm77jP1rC1D1ygoRsNeXl0uW/q7JWCZmV YtjvqDffPPtqvc//zXCcoVM8cas10+579v+ahOAeNArMzp5deiUCCPlbDSqyVA== 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 v8 02/13] net: sfp: pass the phy_device when disconnecting an sfp module's PHY Date: Tue, 20 Feb 2024 19:42:05 +0100 Message-ID: <20240220184217.3689988-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220184217.3689988-1-maxime.chevallier@bootlin.com> References: <20240220184217.3689988-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: 1791444510046239616 X-GMAIL-MSGID: 1791444510046239616 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 --- V8: No changes 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 503fd7c40523..8a34883eb99b 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)