From patchwork Mon Apr 22 09:44:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13638135 X-Patchwork-Delegate: kuba@kernel.org 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 B22CB5579A for ; Mon, 22 Apr 2024 09:44:46 +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=1713779086; cv=none; b=NZyOmLl5bjMyluhd8jGJcgPmjHwDHd+O4z1KRSXu2G2DNcfbRZuQ7g7WKrz37tTx7zFHC4qrKAsHphOyFBTQLbAezHGnK+53ybaesmsHF14L79GHQlZD0dOrH4gJmHppBVPuE/cVSBqcDIn+ncPiwR+b15VJ2JY8eRO86iFE1nw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713779086; c=relaxed/simple; bh=Rs38yYhmzLus4bRtmiHPZEPwON0z0AYCa84i+53z8OQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=QFT9mlsvjekQjrObzFYoARz6Ceq7S9GLDA7YwZkbXNUoSUm/JjyzGQxi72FCM8e0pCWAFy9IRRjX1lf17a+xMzi6LydOYz3LPKq/wZdU2PRI9nahM05/ud3MYoQH4phwVyKOF1CFrmWW7RaLEVFBzOwHbjFq3tDy6YtE6aDLJF0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O3SRkzs3; 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="O3SRkzs3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DAE9C2BD11; Mon, 22 Apr 2024 09:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713779086; bh=Rs38yYhmzLus4bRtmiHPZEPwON0z0AYCa84i+53z8OQ=; h=From:To:Cc:Subject:Date:From; b=O3SRkzs3tUEFiJtDXA7Joj8WLTceDGXBAo8tUvxzvn9qM8fnt3deggPqajvL8JbIt oVKowo622dfK7nmAxUM1TvEKiE3ED0/VpUY2PebTMplt3yiqyxJyee9J6iGsQAZzz/ K76KeGZ/B1hK5rpZV8zW7g9ulKbBRhiGoHQLObXOBfCAPfxXdB1rUgZj2G9zZQBimV d/uTnyZ36lvBvVYQ5QRpDllVfbSnNkvpuf4iohCNOznbWQXfvYqOLgdqSviy87VLFd o6YhZvz9loqBgvBvyqDt5+hGqfL0PUKXbfJnkGIiCnnxXwXZEazYxmHZC2Nu17SQf8 BQDPTKpz1Qd3w== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: netdev@vger.kernel.org, Russell King Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , Andrew Lunn , Heiner Kallweit Subject: [PATCH net-next 1/2] net: sfp: update comment for FS SFP-10G-T quirk Date: Mon, 22 Apr 2024 11:44:34 +0200 Message-ID: <20240422094435.25913-1-kabel@kernel.org> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Update the comment for the Fibrestore SFP-10G-T module: since commit e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module") we also do a 4 second wait before probing the PHY. Fixes: e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module") Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- Since this only fixes a comment and the next patch is based on this one, I am sending to net-next instead of net. --- drivers/net/phy/sfp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 6e7639fc64dd..1af15f2da8a6 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -468,8 +468,9 @@ static const struct sfp_quirk sfp_quirks[] = { SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, sfp_fixup_nokia), - // Fiberstore SFP-10G-T doesn't identify as copper, and uses the - // Rollball protocol to talk to the PHY. + // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball + // protocol to talk to the PHY and needs 4 sec wait before probing the + // PHY. SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd From patchwork Mon Apr 22 09:44:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13638136 X-Patchwork-Delegate: kuba@kernel.org 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 06A6152F96 for ; Mon, 22 Apr 2024 09:44:51 +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=1713779092; cv=none; b=EvKiKlNU3FzObdaelDbHenSOcBQ+IDdx2jpSQjtwUDQLEAy4J6Fi+0mRmOC3Kw4N6N3gXPaDQTiwsdH+JSvlgEi3x0utgsE7TU7VojcJ+DKQssuOARvxB3sIcq7Diyn1ZztltKPitfUyAP1pEmCsC82fuf+2ulaBQyyXSwjNtTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713779092; c=relaxed/simple; bh=dYAYKUPe7HxeAfTBnafmssqy2FHNs1fz5JWVxLDOoSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q02QpU11lHzBH+8hGoMFhxF+SNOmFmyg18KZtX/T47Vy+IPnjAx74AA0cXrCcyNWVCqHEjmrCj+1LtY25OFbFH8wzj/SMV2M0GpywR4duV9u8nVxgokeQEGdiCODcGpiZd+c4G/UTkxsWN5jyKRL9FaGq6cedooKxrZqcTgqLBs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AhaQGu5F; 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="AhaQGu5F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1A30C3277B; Mon, 22 Apr 2024 09:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713779091; bh=dYAYKUPe7HxeAfTBnafmssqy2FHNs1fz5JWVxLDOoSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AhaQGu5FPFmzPHcDj5UWEmp/kK/Pis6Dg8bn4g6jxR+2EssgcB1w3AkXyr0GO3Jyi gofuBGDB+rIIF9Bku5n9pUJiSrGe5oP6Wgq+RjlDcNxRwf0epjRLCoQvSyCf9zZrJB bHpKVYh81dD2OiDEjAirRe24P1odMmkDB3vL/+qSLLdaCOA+kCFsp7bDKM+1Np9VOG 8kA5P7KUu66Qd+X/7esyW9f9vzCKxXx1nhmnfvuocK+fRgYiLSo3oBJHfmss1qF2FE MqMG8pkRiAmQUrZPKXFWpxXVPGQ4M48rJaBYL1hZLXt7nZbNRmqK1+djV25wQ/Or9Q MKu0rfXeJQPIw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: netdev@vger.kernel.org, Russell King , Raju Lakkaraju , Frank Wunderlich , Simon Horman , Eric Woudstra Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , Andrew Lunn , Heiner Kallweit Subject: [PATCH net-next 2/2] net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module Date: Mon, 22 Apr 2024 11:44:35 +0200 Message-ID: <20240422094435.25913-2-kabel@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240422094435.25913-1-kabel@kernel.org> References: <20240422094435.25913-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Enhance the quirk for Fibrestore 2.5G copper SFP module. The original commit e27aca3760c0 ("net: sfp: add quirk for FS's 2.5G copper SFP") introducing the quirk says that the PHY is inaccessible, but that is not true. The module uses Rollball protocol to talk to the PHY, and needs a 4 second wait before probing it, same as FS 10G module. The PHY inside the module is Realtek RTL8221B-VB-CG PHY, for which the realtek driver we only recently gained support to set it up via clause 45 accesses. Signed-off-by: Marek Behún --- This patch depends on realtek driver changes merged in c31bd5b6ff6f ("Merge branch 'rtl8226b-serdes-switching'") which are currently only in net-next. Frank, Russell, do you still have access to OEM SFP-2.5G-T module? It could make sense to try this quirk also for those modeuls, instead of the current sfp_quirk_oem_2_5g. --- drivers/net/phy/sfp.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 1af15f2da8a6..7d063cd3c6af 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -385,18 +385,23 @@ static void sfp_fixup_rollball(struct sfp *sfp) sfp->phy_t_retry = msecs_to_jiffies(1000); } -static void sfp_fixup_fs_10gt(struct sfp *sfp) +static void sfp_fixup_fs_2_5gt(struct sfp *sfp) { - sfp_fixup_10gbaset_30m(sfp); sfp_fixup_rollball(sfp); - /* The RollBall fixup is not enough for FS modules, the AQR chip inside + /* The RollBall fixup is not enough for FS modules, the PHY chip inside * them does not return 0xffff for PHY ID registers in all MMDs for the * while initializing. They need a 4 second wait before accessing PHY. */ sfp->module_t_wait = msecs_to_jiffies(4000); } +static void sfp_fixup_fs_10gt(struct sfp *sfp) +{ + sfp_fixup_10gbaset_30m(sfp); + sfp_fixup_fs_2_5gt(sfp); +} + static void sfp_fixup_halny_gsfp(struct sfp *sfp) { /* Ignore the TX_FAULT and LOS signals on this module. @@ -473,6 +478,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 GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd // NRZ in their EEPROM SFP_QUIRK("FS", "GPON-ONU-34-20BI", sfp_quirk_2500basex, @@ -489,9 +498,6 @@ static const struct sfp_quirk sfp_quirks[] = { SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex, sfp_fixup_ignore_tx_fault), - // FS 2.5G Base-T - SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g), - // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report // 2500MBd NRZ in their EEPROM SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),