From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A2B3A04DD for ; Wed, 18 Nov 2020 17:37:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 33568C8DC; Wed, 18 Nov 2020 17:37:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id CC708C8B0 for ; Wed, 18 Nov 2020 17:37:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pXdRL8DklhfCjH4XtUZVFElIMEgLYVSNsj6MtoRuSNc=; b=g90iBgDcqDvy+xaEeOo0OIyp60woqayM+RnrGCpn7ZNPmKSRXJ87U5asjuz5XnWEan1t0F 2wo3QGTuNZdBWot23eVI2S9k8sOXBHz6CHBuvYH8qaPeLr/xTof1QWKddkQbSD7400Anay 8Nzry8BTK40yeKyT2EVRacxdWyTVdpM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-GhAkWqw5PU-o_e3ZoumTsQ-1; Wed, 18 Nov 2020 11:37:14 -0500 X-MC-Unique: GhAkWqw5PU-o_e3ZoumTsQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 296C01005D7C; Wed, 18 Nov 2020 16:36:45 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44E75C1A3; Wed, 18 Nov 2020 16:36:43 +0000 (UTC) From: Kevin Traynor To: Rasesh Mody Cc: Souvik Dey , dpdk stable Date: Wed, 18 Nov 2020 16:35:02 +0000 Message-Id: <20201118163558.1101823-16-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/bnx2x: add QLogic vendor id for BCM57840' has been queued to LTS release 18.11.11 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.11 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/24/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. 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/681f5a65b32aa22da09989a8cb3598ea4cca7a0c Thanks. Kevin. --- >From 681f5a65b32aa22da09989a8cb3598ea4cca7a0c Mon Sep 17 00:00:00 2001 From: Rasesh Mody 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 Signed-off-by: Rasesh Mody --- 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 5cff77337a..369ab8135b 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -20,4 +20,5 @@ int bnx2x_logtype_driver; */ #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) }, @@ -27,4 +28,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { { 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 @@ -32,4 +34,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { { 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,4 +44,5 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = { { 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.280334567 +0000 +++ 0016-net-bnx2x-add-QLogic-vendor-id-for-BCM57840.patch 2020-11-18 16:33:37.917215054 +0000 @@ -1 +1 @@ -From 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b Mon Sep 17 00:00:00 2001 +From 681f5a65b32aa22da09989a8cb3598ea4cca7a0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 40225b2f44..ce9df87489 100644 +index 5cff77337a..369ab8135b 100644 @@ -21 +22 @@ -@@ -18,4 +18,5 @@ +@@ -20,4 +20,5 @@ int bnx2x_logtype_driver; @@ -27 +28 @@ -@@ -25,4 +26,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { +@@ -27,4 +28,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { @@ -33 +34 @@ -@@ -30,4 +32,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { +@@ -32,4 +34,5 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { @@ -39 +40 @@ -@@ -39,4 +42,5 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = { +@@ -41,4 +44,5 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = {