From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.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 838B325486D; Thu, 3 Apr 2025 19:03:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707005; cv=none; b=RnoYPxarNTu9f+Oii3jxEUb4mhms2empNKRuIohMQA0eMohSVwU3dJAoRLTkDMeicPPtB/ss5KnKLMvw09ETgYwb8+8HrPUSVgdp8PT2f7GWJGMcwzkO4X+PeXs5dmT4jNWwXHyKeqLi3/7MNwzfguBWb+j55ArsPWG82mm+5X8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707005; c=relaxed/simple; bh=gXsEj8UjjtOmll3mukiHGHK0tAM8sjldPqEV7KznP/8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qq9HdhX7h8bLAQDPMLCaqngaydh+aNSSgzZlpx101xwSp/IfMIb3+Dpr/vG4GkRKl9E4AA6gCoP0y4ytCD4fDybhku4DKBv8H2ZjkgSabOvWnrRoyjRRFL9qFSe2kLmlwXvhJEl7u7ni1Y8F1Tmma5/UTIUUdpTinR4qprI3s5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E1Dx7J+m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E1Dx7J+m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A348C4CEE3; Thu, 3 Apr 2025 19:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707005; bh=gXsEj8UjjtOmll3mukiHGHK0tAM8sjldPqEV7KznP/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E1Dx7J+mk/cDmj+KiG1ZZ0i6CsZUhLaWpcPA3fln4XWxpCH/ORxTJfgUSTpeM1toV faL1/EjjsbYqgsM3ea/3rdnSzsNSwfqxgg34squ1pOk3dc7F7rgatYfaboiuiflydj f31FQp5mgWf781P7hr1myiDDv+KAN3iQ7Wn4yPDptKIgZSTJL7R3h6QiaUQ52LbjHY 9J2vERpOK5Pz6BjVVrfQ3h5vqL5OWddXl9xWgcEdGApuR+wKlB0jZ2AjjafiVhjyCe VyI/RiUZg6/tHq5Ks8kcIEG9p8bT/l/o4QmOI7SCFx3nerZGJCAufE3csBrMrqdyDB 2YAo/aE9lO9kA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Schiller , Jakub Kicinski , Sasha Levin , linux@armlinux.org.uk, andrew@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 31/54] net: sfp: add quirk for FS SFP-10GM-T copper SFP+ module Date: Thu, 3 Apr 2025 15:01:46 -0400 Message-Id: <20250403190209.2675485-31-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403190209.2675485-1-sashal@kernel.org> References: <20250403190209.2675485-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14 Content-Transfer-Encoding: 8bit From: Martin Schiller [ Upstream commit 05ec5c085eb7ae044d49e04a3cff194a0b2a3251 ] Add quirk for a copper SFP that identifies itself as "FS" "SFP-10GM-T". It uses RollBall protocol to talk to the PHY and needs 4 sec wait before probing the PHY. Signed-off-by: Martin Schiller Link: https://patch.msgid.link/20250227071058.1520027-1-ms@dev.tdt.de Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/sfp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 9369f52977694..c88217af44a14 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -385,7 +385,7 @@ static void sfp_fixup_rollball(struct sfp *sfp) sfp->phy_t_retry = msecs_to_jiffies(1000); } -static void sfp_fixup_fs_2_5gt(struct sfp *sfp) +static void sfp_fixup_rollball_wait4s(struct sfp *sfp) { sfp_fixup_rollball(sfp); @@ -399,7 +399,7 @@ static void sfp_fixup_fs_2_5gt(struct sfp *sfp) static void sfp_fixup_fs_10gt(struct sfp *sfp) { sfp_fixup_10gbaset_30m(sfp); - sfp_fixup_fs_2_5gt(sfp); + sfp_fixup_rollball_wait4s(sfp); } static void sfp_fixup_halny_gsfp(struct sfp *sfp) @@ -479,9 +479,10 @@ static const struct sfp_quirk sfp_quirks[] = { // PHY. SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), - // Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the PHY and - // needs 4 sec wait before probing the PHY. - SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt), + // Fiberstore SFP-2.5G-T and SFP-10GM-T uses Rollball protocol to talk + // to the PHY and needs 4 sec wait before probing the PHY. + SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_rollball_wait4s), + SFP_QUIRK_F("FS", "SFP-10GM-T", sfp_fixup_rollball_wait4s), // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd // NRZ in their EEPROM -- 2.39.5