From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 71BE3A0096 for ; Wed, 8 May 2019 12:15:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A60537AF; Wed, 8 May 2019 12:15:59 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D50822BD5 for ; Wed, 8 May 2019 12:15:57 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4984489C35; Wed, 8 May 2019 10:15:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ACF61A267; Wed, 8 May 2019 10:15:56 +0000 (UTC) From: Kevin Traynor To: Rasesh Mody Cc: dpdk stable Date: Wed, 8 May 2019 11:14:48 +0100 Message-Id: <20190508101534.8984-6-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 08 May 2019 10:15:57 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnx2x: fix optic module verification' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/90baad67611a2ddfd9731cb1d441ea13f7014020 Thanks. Kevin Traynor --- >From 90baad67611a2ddfd9731cb1d441ea13f7014020 Mon Sep 17 00:00:00 2001 From: Rasesh Mody 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 --- 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 f32db6d12..3e705c7a1 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -8104,4 +8104,25 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc) } + 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 = diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index bb8031001..ef1688ff3 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -120,4 +120,6 @@ int bnx2x_ilog2(int x) #endif +#define BNX2X_BC_VER 0x040200 + #include "ecore_sp.h" -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.161360145 +0100 +++ 0006-net-bnx2x-fix-optic-module-verification.patch 2019-05-08 11:05:05.760934205 +0100 @@ -1 +1 @@ -From 5a6af6baa8c64ab31bd457b12be1f5173194bec6 Mon Sep 17 00:00:00 2001 +From 90baad67611a2ddfd9731cb1d441ea13f7014020 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5a6af6baa8c64ab31bd457b12be1f5173194bec6 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org