[dpdk-stable] patch 'net/bnx2x: add QLogic vendor id for BCM57840' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From 6373e6571ebb373139c6904836b2e29fdbe1b448 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody at marvell.com>
Date: Mon, 12 Oct 2020 15:48:14 -0700
Subject: [PATCH] net/bnx2x: add QLogic vendor id for BCM57840

[ upstream commit 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b ]

Add QLogic vendor id support for BCM57840 device ids.

Fixes: 9fb557035d90 ("bnx2x: enable PMD build")

Reported-by: Souvik Dey <sodey at rbbn.com>
Signed-off-by: Rasesh Mody <rmody at marvell.com>
---
 drivers/net/bnx2x/bnx2x_ethdev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 7864b5b80a..8a1a3fc7f9 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -20,6 +20,7 @@ int bnx2x_logtype_driver;
  * The set of PCI devices this driver supports
  */
 #define BROADCOM_PCI_VENDOR_ID 0x14E4
+#define QLOGIC_PCI_VENDOR_ID 0x1077
 static const struct rte_pci_id pci_id_bnx2x_map[] = {
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57800) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57711) },
@@ -27,11 +28,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = {
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_OBS) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) },
+	{ RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_2_20) },
 #ifdef RTE_LIBRTE_BNX2X_MF_SUPPORT
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_MF) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_MF) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_MF) },
+	{ RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_MF) },
 #endif
 	{ .vendor_id = 0, }
 };
@@ -41,6 +44,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = {
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_VF) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_VF) },
 	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },
+	{ RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },
 	{ .vendor_id = 0, }
 };
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.295759596 +0000
+++ 0180-net-bnx2x-add-QLogic-vendor-id-for-BCM57840.patch	2020-10-28 10:35:11.788834205 +0000
@@ -1,12 +1,13 @@
-From 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b Mon Sep 17 00:00:00 2001
+From 6373e6571ebb373139c6904836b2e29fdbe1b448 Mon Sep 17 00:00:00 2001
 From: Rasesh Mody <rmody at marvell.com>
 Date: Mon, 12 Oct 2020 15:48:14 -0700
 Subject: [PATCH] net/bnx2x: add QLogic vendor id for BCM57840
 
+[ upstream commit 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b ]
+
 Add QLogic vendor id support for BCM57840 device ids.
 
 Fixes: 9fb557035d90 ("bnx2x: enable PMD build")
-Cc: stable at dpdk.org
 
 Reported-by: Souvik Dey <sodey at rbbn.com>
 Signed-off-by: Rasesh Mody <rmody at marvell.com>
@@ -15,10 +16,10 @@
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
-index 40225b2f44..ce9df87489 100644
+index 7864b5b80a..8a1a3fc7f9 100644
 --- a/drivers/net/bnx2x/bnx2x_ethdev.c
 +++ b/drivers/net/bnx2x/bnx2x_ethdev.c
-@@ -17,6 +17,7 @@
+@@ -20,6 +20,7 @@ int bnx2x_logtype_driver;
   * The set of PCI devices this driver supports
   */
  #define BROADCOM_PCI_VENDOR_ID 0x14E4
@@ -26,7 +27,7 @@
  static const struct rte_pci_id pci_id_bnx2x_map[] = {
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57800) },
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57711) },
-@@ -24,11 +25,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = {
+@@ -27,11 +28,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = {
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811) },
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_OBS) },
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) },
@@ -40,7 +41,7 @@
  #endif
  	{ .vendor_id = 0, }
  };
-@@ -38,6 +41,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = {
+@@ -41,6 +44,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = {
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_VF) },
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_VF) },
  	{ RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },