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 E18B71C84D4; Thu, 17 Apr 2025 18:42:52 +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=1744915373; cv=none; b=je/Sywvvr53bvlIOD58KPLspR1royhBE5XuUpPSL3RIPGyKtuQN1gbl3vVU+4ngdGvbCf0O23znxol9V35y4zzxgluueZTpjsyJMkuWxp+ON6mRjNRjjR0ivPJ5uy4j1ZufqgxV78R9I2/zoKq2jaEZQNoI2aITvvWaH0GCN0z8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744915373; c=relaxed/simple; bh=PN2TIWFV8mtHPotSWKJa0lT5zK4yuaWcVk8eNz4FeQ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SLZ6PGzod6jwz/Pm7pgZGGhYCJEDva0txuD3pniXhXKWKRjzKkcPHrxjbO/4Dynl2CXQtaoPYg1eoNpNyuAOwrNvvaTqrcg300k1/L4zq4bXQtIqtINfiIuHM1YsoC3DohaadAXrA/Zhl3Awws3UaIz35DdtVnVvAKRTUnFp9X4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NSGfBrXv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NSGfBrXv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A1CBC4CEE4; Thu, 17 Apr 2025 18:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744915372; bh=PN2TIWFV8mtHPotSWKJa0lT5zK4yuaWcVk8eNz4FeQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSGfBrXvxMBQbBQ5ejxbQ5owiT/Yld0Egyv9Opuwxv1k3KgqTDdk/X8ip6ARBNuCN JJSX7nFuooNoF47QIMTeniSzRFvpiUQJ7Ns8GbfPXZanBpu+TVJs4/RbMFqUxKsc+O Cd6vMJNhqE7ENv8Fizjz3RP8d8OzgXycFG8flKA8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Martin Schiller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 107/393] net: sfp: add quirk for FS SFP-10GM-T copper SFP+ module Date: Thu, 17 Apr 2025 19:48:36 +0200 Message-ID: <20250417175111.895449661@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175107.546547190@linuxfoundation.org> References: <20250417175107.546547190@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ 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 9a5de80acd2f7..7b33993f7001e 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