[dpdk-stable] patch 'net/bnx2x: fix optic module verification' has been queued to LTS release 17.11.7

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From a69513a470dd5388eb4345bda394827021a416be Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody at marvell.com>
Date: Thu, 11 Apr 2019 18:47:42 -0700
Subject: [PATCH] net/bnx2x: fix optic module verification

[ upstream commit 5a6af6baa8c64ab31bd457b12be1f5173194bec6 ]

Enable the optic module vendor and part number verification from driver
by setting appropriate flags. Link handling module in conjunction with
FW performs optic module verification.

Without this fix the SFP is powered down and the link doesn't come up,
if module verification is enforced in nvram setting.

Fixes: 540a211084a7 ("bnx2x: driver core")

Signed-off-by: Rasesh Mody <rmody at marvell.com>
---
 drivers/net/bnx2x/bnx2x.c | 21 +++++++++++++++++++++
 drivers/net/bnx2x/bnx2x.h |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 8d6a191be0..9f19099173 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -8111,6 +8111,27 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc)
 		    ~ELINK_FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED;
 	}
 
+	val = sc->devinfo.bc_ver >> 8;
+	if (val < BNX2X_BC_VER) {
+		/* for now only warn later we might need to enforce this */
+		PMD_DRV_LOG(NOTICE, sc, "This driver needs bc_ver %X but found %X, please upgrade BC\n",
+			    BNX2X_BC_VER, val);
+	}
+	sc->link_params.feature_config_flags |=
+				(val >= REQ_BC_VER_4_VRFY_FIRST_PHY_OPT_MDL) ?
+				ELINK_FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY :
+				0;
+
+	sc->link_params.feature_config_flags |=
+		(val >= REQ_BC_VER_4_VRFY_SPECIFIC_PHY_OPT_MDL) ?
+		ELINK_FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY : 0;
+	sc->link_params.feature_config_flags |=
+		(val >= REQ_BC_VER_4_VRFY_AFEX_SUPPORTED) ?
+		ELINK_FEATURE_CONFIG_BC_SUPPORTS_AFEX : 0;
+	sc->link_params.feature_config_flags |=
+		(val >= REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED) ?
+		ELINK_FEATURE_CONFIG_BC_SUPPORTS_SFP_TX_DISABLED : 0;
+
 	/* get the initial value of the link params */
 	sc->link_params.multi_phy_config =
 	    SHMEM_RD(sc, dev_info.port_hw_config[port].multi_phy_config);
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index d050b2a5d6..8a707340c9 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -121,6 +121,8 @@ int bnx2x_ilog2(int x)
 #define ilog2(x) bnx2x_ilog2(x)
 #endif
 
+#define BNX2X_BC_VER		0x040200
+
 #include "ecore_sp.h"
 
 struct bnx2x_device_type {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:10.887236324 -0700
+++ 0082-net-bnx2x-fix-optic-module-verification.patch	2019-07-22 17:55:06.370473000 -0700
@@ -1,8 +1,10 @@
-From 5a6af6baa8c64ab31bd457b12be1f5173194bec6 Mon Sep 17 00:00:00 2001
+From a69513a470dd5388eb4345bda394827021a416be Mon Sep 17 00:00:00 2001
 From: Rasesh Mody <rmody at marvell.com>
 Date: Thu, 11 Apr 2019 18:47:42 -0700
 Subject: [PATCH] net/bnx2x: fix optic module verification
 
+[ upstream commit 5a6af6baa8c64ab31bd457b12be1f5173194bec6 ]
+
 Enable the optic module vendor and part number verification from driver
 by setting appropriate flags. Link handling module in conjunction with
 FW performs optic module verification.
@@ -11,7 +13,6 @@
 if module verification is enforced in nvram setting.
 
 Fixes: 540a211084a7 ("bnx2x: driver core")
-Cc: stable at dpdk.org
 
 Signed-off-by: Rasesh Mody <rmody at marvell.com>
 ---
@@ -20,10 +21,10 @@
  2 files changed, 23 insertions(+)
 
 diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
-index f32db6d12a..3e705c7a10 100644
+index 8d6a191be0..9f19099173 100644
 --- a/drivers/net/bnx2x/bnx2x.c
 +++ b/drivers/net/bnx2x/bnx2x.c
-@@ -8103,6 +8103,27 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc)
+@@ -8111,6 +8111,27 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc)
  		    ~ELINK_FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED;
  	}
  
@@ -52,10 +53,10 @@
  	sc->link_params.multi_phy_config =
  	    SHMEM_RD(sc, dev_info.port_hw_config[port].multi_phy_config);
 diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
-index bb80310014..ef1688ff3b 100644
+index d050b2a5d6..8a707340c9 100644
 --- a/drivers/net/bnx2x/bnx2x.h
 +++ b/drivers/net/bnx2x/bnx2x.h
-@@ -119,6 +119,8 @@ int bnx2x_ilog2(int x)
+@@ -121,6 +121,8 @@ int bnx2x_ilog2(int x)
  #define ilog2(x) bnx2x_ilog2(x)
  #endif