patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' has been queued to stable release 21.11.9

Kevin Traynor ktraynor at redhat.com
Wed Nov 27 18:18:45 CET 2024


Hi,

FYI, your patch has been queued to stable release 21.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/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/477074d478d0ae8064a496f6efbdb9d7a9211267

Thanks.

Kevin

---
>From 477074d478d0ae8064a496f6efbdb9d7a9211267 Mon Sep 17 00:00:00 2001
From: Peter Morrow <peter at graphiant.com>
Date: Mon, 12 Aug 2024 11:34:05 +0100
Subject: [PATCH] net/bnxt: fix reading SFF-8436 SFP EEPROMs

[ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ]

If a SFP which supports SFF-8436 is present then
currently the DDM information present in the eeprom
is not read. Furthermore bnxt_get_module_eeprom()
will return -EINVAL for these eeproms since the
length of these eeproms is 512 bytes but we are
only ever selecting 2 pages (256 bytes) to read.

Fixes: 6253a23491a4 ("net/bnxt: dump SFP module info")

Signed-off-by: Peter Morrow <peter at graphiant.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 .mailmap                       | 1 +
 drivers/net/bnxt/bnxt_ethdev.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 5e0de73ae0..0317d15bc4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1077,4 +1077,5 @@ Peng Zhang <peng.zhang at corigine.com> <peng1x.zhang at intel.com>
 Pengzhen Liu <liupengzhen3 at huawei.com>
 Peter Mccarthy <peter.mccarthy at intel.com>
+Peter Morrow <peter at graphiant.com>
 Peter Spreadborough <peter.spreadborough at broadcom.com>
 Petr Houska <t-pehous at microsoft.com>
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 63ef5593b0..347080df6c 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3959,5 +3959,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,
 	switch (module_info[0]) {
 	case SFF_MODULE_ID_SFP:
-		module_info[SFF_DIAG_SUPPORT_OFFSET] = 0;
 		if (module_info[SFF_DIAG_SUPPORT_OFFSET]) {
 			pg_addr[2] = I2C_DEV_ADDR_A2;
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:41.340314995 +0000
+++ 0098-net-bnxt-fix-reading-SFF-8436-SFP-EEPROMs.patch	2024-11-27 17:17:38.310269814 +0000
@@ -1 +1 @@
-From 7b8400464f14637ed2669dbf732c256bf2447de6 Mon Sep 17 00:00:00 2001
+From 477074d478d0ae8064a496f6efbdb9d7a9211267 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index f293f89167..5a8ec89d47 100644
+index 5e0de73ae0..0317d15bc4 100644
@@ -27 +28 @@
-@@ -1180,4 +1180,5 @@ Peng Zhang <peng.zhang at corigine.com> <peng1x.zhang at intel.com>
+@@ -1077,4 +1077,5 @@ Peng Zhang <peng.zhang at corigine.com> <peng1x.zhang at intel.com>
@@ -31 +31,0 @@
- Peter Nilsson <peter.j.nilsson at ericsson.com>
@@ -32,0 +33 @@
+ Petr Houska <t-pehous at microsoft.com>
@@ -34 +35 @@
-index 2f5c055086..5edb162430 100644
+index 63ef5593b0..347080df6c 100644
@@ -37 +38 @@
-@@ -4223,5 +4223,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,
+@@ -3959,5 +3959,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,



More information about the stable mailing list