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 BFABD454E9 for ; Tue, 25 Jun 2024 02:00:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBA2E41140; Tue, 25 Jun 2024 02:00:47 +0200 (CEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 63A17400EF for ; Tue, 25 Jun 2024 02:00:46 +0200 (CEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3651ee582cfso2732965f8f.2 for ; Mon, 24 Jun 2024 17:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273646; x=1719878446; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jvjILDt5ulA4bSOap5HJw4UPFDuA1KY0aGejtFI+i6I=; b=cEfAfKzjRIl0GY3olyiSCQC8cITi7m0QUkzit3WW1OmT30REql2tOI6Nan/vTxxcjN oWnUBwCUDXcW0XJMELWade3Kydhngg3x5xiBfMbX3giYohiu9weZjR8p0zSeCMiWbG2E fT1FKKkyhfv9dC/HPoPLDT5/sf7HQ0N6/aVbC+O2DSMc/IPjjn9sxjdW5av138vA8HUL 403ZFk4ip1EL3jAdXGXKyK1VN6ogJqxLPp2bc1N2sxRSPEmbAopdPyfwJTSDSPnFZox+ 0DItfdgHzWQkHpkI2V2+EpEqqsXXjZF3fvILin5XbkzCgS4/GpEkWeMgkiwESkYel+ur xGIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273646; x=1719878446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jvjILDt5ulA4bSOap5HJw4UPFDuA1KY0aGejtFI+i6I=; b=ZT+fuRJLQwy/7PMQoIXLkGD39VlwDaSSFjkn2W1hjXmfGwkHXvLoBWsxqiz5yFWK6i GEXFAGX12MMXIdZOoHzB/xDVpowhPAMeWuDow+T8iDNNjfPBPtg5mIKhd7RxNKAqK5hs YJeYxKbLkeiKq3Sxot7y/52pZitbjb4g7bWMnz/EBK38UQD4oJmm8FPCAR6irGRaVlPj riqaxjSRwGFUA0fT7hZ45/hGWpNcL4zl6BHN3sIok+ZXLpvlTy8EdAPjos8jweTRO2QE z6iJZew0PsiqJSeLeZcHL4k1B1DU6J1gfHD9Zn1b8RdTX6ttyt7FZIkRHEo4qKDG3u4J pv1A== X-Forwarded-Encrypted: i=1; AJvYcCUWkHyVxoUIOiCxmSoYZY9PnUJFoAzDVriv39hqTL1Qhwf1oys1xqVB6I6yEXS7jsGiqpz+zd61f8OXRAYBVlc= X-Gm-Message-State: AOJu0Yx8M+/BZ0kn5bjn7BWb43GnAktx3SPAzjAhj8t3jFVK254ycW92 FyKh5JlHuFz99xWjsrx3cW7RHBUCBU+3ninF2kuZh8vAKI9lnYUQJCGXKg== X-Google-Smtp-Source: AGHT+IFzO/ad8aHKSWxehd0iKKYqT8fVjxt4Rm5fGxVm61/1MYzjJiqSB9T7TuJINoLRupwpZH/lVQ== X-Received: by 2002:a05:6000:1847:b0:366:eb61:b4a with SMTP id ffacd0b85a97d-366eb610bd2mr4953526f8f.4.1719273645995; Mon, 24 Jun 2024 17:00:45 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366383f65bcsm11275861f8f.13.2024.06.24.17.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:00:45 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Tue, 25 Jun 2024 00:58:16 +0100 Message-Id: <20240624235907.885628-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/73e8b7893e102f3c4d01dd7b510b1c64e3e6171f Thanks. Luca Boccassi --- >From 73e8b7893e102f3c4d01dd7b510b1c64e3e6171f 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 9aadbefaba..85b01bfa10 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -69,6 +69,7 @@ enum axgbe_sfp_cable { AXGBE_SFP_CABLE_UNKNOWN = 0, AXGBE_SFP_CABLE_ACTIVE, AXGBE_SFP_CABLE_PASSIVE, + AXGBE_SFP_CABLE_FIBER, }; enum axgbe_sfp_base { @@ -616,16 +617,18 @@ 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; else if (sfp_base[AXGBE_SFP_BASE_10GBE_CC] & AXGBE_SFP_BASE_10GBE_CC_SR) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:15.440216439 +0100 +++ 0030-net-axgbe-fix-connection-for-SFP-active-cables.patch 2024-06-25 00:22:13.121184344 +0100 @@ -1 +1 @@ -From 4823ccdbbd887bb84339a4d35febd92292d07b97 Mon Sep 17 00:00:00 2001 +From 73e8b7893e102f3c4d01dd7b510b1c64e3e6171f 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 9aadbefaba..85b01bfa10 100644