From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0444A45804 for ; Fri, 23 Aug 2024 18:20:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF1FB4337B; Fri, 23 Aug 2024 18:20:33 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 102E84336D for ; Fri, 23 Aug 2024 18:20:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/SoDofPBPE5gVVOp/vSyvOwB+1o1gPOKQvXEyyLk+oo=; b=hxmyCtLepwpbXs4joTvK9CkfFjF8oXK6ahLvFAo+CDFYc1DB8M/OvOEPhPqk+RQOdFlcBr mW7hJSg79k4ruZzPR10BN/hZf3TTbOeWvFlXyOW9dk19kGvCavkKI+UwP2VUrIS0YddNtB Bz/n11SO2vuK7JCV1LenLUoxRwQCIbQ= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-6-19n7-tAgPxeXq79ygmp74A-1; Fri, 23 Aug 2024 12:20:28 -0400 X-MC-Unique: 19n7-tAgPxeXq79ygmp74A-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E27A119560BF; Fri, 23 Aug 2024 16:20:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84DFC1956053; Fri, 23 Aug 2024 16:20:25 +0000 (UTC) From: Kevin Traynor To: Venkat Kumar Ande Cc: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix connection for SFP+ active cables' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:31 +0100 Message-ID: <20240823161929.1004778-23-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3fe8271448da39f64966d90116ff1675fc266188 Thanks. Kevin --- >From 3fe8271448da39f64966d90116ff1675fc266188 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:41 +0530 Subject: [PATCH] net/axgbe: fix connection for SFP+ active cables [ upstream commit 4823ccdbbd887bb84339a4d35febd92292d07b97 ] SFP+ active and passive cables are copper cables with fixed SFP+ end connectors. Due to a misinterpretation of this, SFP+ active cables could end up not being recognized, causing the driver to fail to establish a connection. Introduce a new enum in SFP+ cable types, XGBE_SFP_CABLE_FIBER, that is the default cable type, and handle active and passive cables when they are specifically detected. Fixes: a5c7273771e8 ("net/axgbe: add phy programming APIs") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- drivers/net/axgbe/axgbe_phy_impl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index c17a074f59..8268590778 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -69,4 +69,5 @@ enum axgbe_sfp_cable { AXGBE_SFP_CABLE_ACTIVE, AXGBE_SFP_CABLE_PASSIVE, + AXGBE_SFP_CABLE_FIBER, }; @@ -616,14 +617,16 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) axgbe_phy_sfp_parse_quirks(pdata); - /* Assume ACTIVE cable unless told it is PASSIVE */ + /* Assume FIBER cable unless told otherwise */ if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) { phy_data->sfp_cable = AXGBE_SFP_CABLE_PASSIVE; phy_data->sfp_cable_len = sfp_base[AXGBE_SFP_BASE_CU_CABLE_LEN]; - } else { + } else if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_ACTIVE) { phy_data->sfp_cable = AXGBE_SFP_CABLE_ACTIVE; + } else { + phy_data->sfp_cable = AXGBE_SFP_CABLE_FIBER; } /* Determine the type of SFP */ - if (phy_data->sfp_cable == AXGBE_SFP_CABLE_PASSIVE && + if (phy_data->sfp_cable != AXGBE_SFP_CABLE_FIBER && axgbe_phy_sfp_bit_rate(sfp_eeprom, AXGBE_SFP_SPEED_10000)) phy_data->sfp_base = AXGBE_SFP_BASE_10000_CR; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.678579175 +0100 +++ 0023-net-axgbe-fix-connection-for-SFP-active-cables.patch 2024-08-23 17:18:09.643429836 +0100 @@ -1 +1 @@ -From 4823ccdbbd887bb84339a4d35febd92292d07b97 Mon Sep 17 00:00:00 2001 +From 3fe8271448da39f64966d90116ff1675fc266188 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4823ccdbbd887bb84339a4d35febd92292d07b97 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 10196cae94..d9585a7404 100644 +index c17a074f59..8268590778 100644 @@ -28 +29 @@ -@@ -70,4 +70,5 @@ enum axgbe_sfp_cable { +@@ -69,4 +69,5 @@ enum axgbe_sfp_cable { @@ -34 +35 @@ -@@ -617,14 +618,16 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) +@@ -616,14 +617,16 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata)