patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' has been queued to stable release 22.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Nov 21 00:41:28 CET 2024
Hi,
FYI, your patch has been queued to stable release 22.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/22/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/881d93b7093baa2bd22489799a4dc106a7ff82de
Thanks.
Luca Boccassi
---
>From 881d93b7093baa2bd22489799a4dc106a7ff82de 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 8ed3b479e1..bef76e5fd9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1078,6 +1078,7 @@ Peng Yu <penyu at amazon.com>
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>
Phanendra Vukkisala <pvukkisala at marvell.com>
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index cb52ef2f84..e44fa4405c 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3959,7 +3959,6 @@ 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;
pg_addr[3] = I2C_DEV_ADDR_A2;
--
2.45.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-11-20 23:41:22.862691175 +0000
+++ 0003-net-bnxt-fix-reading-SFF-8436-SFP-EEPROMs.patch 2024-11-20 23:41:22.684195466 +0000
@@ -1 +1 @@
-From 7b8400464f14637ed2669dbf732c256bf2447de6 Mon Sep 17 00:00:00 2001
+From 881d93b7093baa2bd22489799a4dc106a7ff82de 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 8ed3b479e1..bef76e5fd9 100644
@@ -27 +28 @@
-@@ -1179,6 +1179,7 @@ Peng Yu <penyu at amazon.com>
+@@ -1078,6 +1078,7 @@ Peng Yu <penyu at amazon.com>
@@ -32 +32,0 @@
- Peter Nilsson <peter.j.nilsson at ericsson.com>
@@ -34,0 +35 @@
+ Phanendra Vukkisala <pvukkisala at marvell.com>
@@ -36 +37 @@
-index 2f5c055086..5edb162430 100644
+index cb52ef2f84..e44fa4405c 100644
@@ -39 +40 @@
-@@ -4222,7 +4222,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,
+@@ -3959,7 +3959,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,
More information about the stable
mailing list