All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Cc: thomas.monjalon@dpdk.org, Sony Chacko <sony.chacko@qlogic.com>
Subject: [PATCH 08/11] bnx2x: move pci device ids to driver
Date: Sun, 10 Jan 2016 13:50:51 +0100	[thread overview]
Message-ID: <1452430254-30390-9-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1452430254-30390-1-git-send-email-david.marchand@6wind.com>

Reused defines from the driver and moved broadcom vendor id macro.

Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 drivers/net/bnx2x/bnx2x.c                       |  3 +-
 drivers/net/bnx2x/bnx2x_ethdev.c                | 25 ++++++++---
 lib/librte_eal/common/include/rte_pci_dev_ids.h | 60 -------------------------
 3 files changed, 20 insertions(+), 68 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 67af5da..bf6dd71 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -22,7 +22,6 @@
 #include "ecore_init_ops.h"
 
 #include "rte_version.h"
-#include "rte_pci_dev_ids.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9592,7 +9591,7 @@ void bnx2x_load_firmware(struct bnx2x_softc *sc)
 	int f;
 	struct stat st;
 
-	fwname = sc->devinfo.device_id == BNX2X_DEV_ID_57711
+	fwname = sc->devinfo.device_id == CHIP_NUM_57711
 		? FW_NAME_57711 : FW_NAME_57810;
 	f = open(fwname, O_RDONLY);
 	if (f < 0) {
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 69df02e..f822cfd 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -16,16 +16,29 @@
 /*
  * The set of PCI devices this driver supports
  */
+#define PCI_VENDOR_ID_BROADCOM 0x14E4
 static struct rte_pci_id pci_id_bnx2x_map[] = {
-#define RTE_PCI_DEV_ID_DECL_BNX2X(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
-#include "rte_pci_dev_ids.h"
-	{ .vendor_id = 0, }
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57800) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57711) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57810) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57811) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57840_OBS) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57840_4_10) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57840_2_20) },
+#ifdef RTE_LIBRTE_BNX2X_MF_SUPPORT
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57810_MF) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57811_MF) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57840_MF) },
+#endif
+{ .vendor_id = 0, }
 };
 
 static struct rte_pci_id pci_id_bnx2xvf_map[] = {
-#define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
-#include "rte_pci_dev_ids.h"
-	{ .vendor_id = 0, }
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57800_VF) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57810_VF) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57811_VF) },
+{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, CHIP_NUM_57840_VF) },
+{ .vendor_id = 0, }
 };
 
 static void
diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h
index 1c22c04..6720b7a 100644
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h
@@ -88,66 +88,6 @@
  * Note that this file can be included multiple times within the same file.
  */
 
-#ifndef RTE_PCI_DEV_ID_DECL_BNX2X
-#define RTE_PCI_DEV_ID_DECL_BNX2X(vend, dev)
-#endif
-
-#ifndef RTE_PCI_DEV_ID_DECL_BNX2XVF
-#define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev)
-#endif
-
-#ifndef PCI_VENDOR_ID_BROADCOM
-/** Vendor ID used by Broadcom devices */
-#define PCI_VENDOR_ID_BROADCOM 0x14E4
-#endif
-
-/****************** QLogic devices ******************/
-
-/* Broadcom/QLogic BNX2X */
-#define BNX2X_DEV_ID_57710	0x164e
-#define BNX2X_DEV_ID_57711	0x164f
-#define BNX2X_DEV_ID_57711E	0x1650
-#define BNX2X_DEV_ID_57712	0x1662
-#define BNX2X_DEV_ID_57712_MF	0x1663
-#define BNX2X_DEV_ID_57712_VF	0x166f
-#define BNX2X_DEV_ID_57713	0x1651
-#define BNX2X_DEV_ID_57713E	0x1652
-#define BNX2X_DEV_ID_57800	0x168a
-#define BNX2X_DEV_ID_57800_MF	0x16a5
-#define BNX2X_DEV_ID_57800_VF	0x16a9
-#define BNX2X_DEV_ID_57810	0x168e
-#define BNX2X_DEV_ID_57810_MF	0x16ae
-#define BNX2X_DEV_ID_57810_VF	0x16af
-#define BNX2X_DEV_ID_57811	0x163d
-#define BNX2X_DEV_ID_57811_MF	0x163e
-#define BNX2X_DEV_ID_57811_VF	0x163f
-
-#define BNX2X_DEV_ID_57840_OBS		0x168d
-#define BNX2X_DEV_ID_57840_OBS_MF	0x16ab
-#define BNX2X_DEV_ID_57840_4_10		0x16a1
-#define BNX2X_DEV_ID_57840_2_20		0x16a2
-#define BNX2X_DEV_ID_57840_MF		0x16a4
-#define BNX2X_DEV_ID_57840_VF		0x16ad
-
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57800)
-RTE_PCI_DEV_ID_DECL_BNX2XVF(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57800_VF)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57711)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57810)
-RTE_PCI_DEV_ID_DECL_BNX2XVF(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57810_VF)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57811)
-RTE_PCI_DEV_ID_DECL_BNX2XVF(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57811_VF)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_OBS)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_4_10)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_2_20)
-RTE_PCI_DEV_ID_DECL_BNX2XVF(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_VF)
-#ifdef RTE_LIBRTE_BNX2X_MF_SUPPORT
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57810_MF)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57811_MF)
-RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF)
-#endif
-
 /*
  * Undef all RTE_PCI_DEV_ID_DECL_* here.
  */
-#undef RTE_PCI_DEV_ID_DECL_BNX2X
-#undef RTE_PCI_DEV_ID_DECL_BNX2XVF
-- 
1.9.1

  parent reply	other threads:[~2016-01-10 12:51 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-05 19:37 time to kill rte_pci_dev_ids.h Stephen Hemminger
2016-01-06  1:40 ` Thomas Monjalon
2016-01-08 13:20   ` David Marchand
2016-01-10 12:50     ` [PATCH 00/11] kill global pci device id list David Marchand
2016-01-10 12:50       ` [PATCH 01/11] e1000: move pci device ids to driver David Marchand
2016-01-10 12:50       ` [PATCH 02/11] ixgbe: " David Marchand
2016-01-10 12:50       ` [PATCH 03/11] i40e: " David Marchand
2016-01-10 20:02         ` Stephen Hemminger
2016-01-12  8:45           ` David Marchand
2016-01-10 12:50       ` [PATCH 04/11] fm10k: " David Marchand
2016-01-10 12:50       ` [PATCH 05/11] virtio: " David Marchand
2016-01-10 12:50       ` [PATCH 06/11] vmxnet3: " David Marchand
2016-01-10 12:50       ` [PATCH 07/11] enic: " David Marchand
2016-01-10 12:50       ` David Marchand [this message]
2016-01-10 12:50       ` [PATCH 09/11] doc: refresh headers list David Marchand
2016-01-12 14:06         ` Mcnamara, John
2016-01-16 15:10           ` David Marchand
2016-01-18  9:47             ` Thomas Monjalon
2016-01-18 16:25             ` Mcnamara, John
2016-01-10 12:50       ` [PATCH 10/11] pci: no need for global device ids list David Marchand
2016-01-10 12:50       ` [PATCH 11/11] pci: place all uio pci device ids in a dedicated section David Marchand
2016-01-10 12:58       ` [PATCH 00/11] kill global pci device id list David Marchand
2016-01-10 13:24         ` Thomas Monjalon
2016-01-10 13:26           ` David Marchand
2016-01-10 13:27             ` David Marchand
2016-01-10 15:53       ` Zhang, Helin
2016-01-16 15:02         ` David Marchand
2016-01-21  1:12           ` Zhang, Helin
2016-01-18 12:30       ` [PATCH v2 00/10] " David Marchand
2016-01-18 12:30         ` [PATCH v2 01/10] e1000: move pci device ids to driver David Marchand
2016-01-18 12:30         ` [PATCH v2 02/10] ixgbe: " David Marchand
2016-01-18 12:30         ` [PATCH v2 03/10] i40e: " David Marchand
2016-01-18 12:30         ` [PATCH v2 04/10] fm10k: " David Marchand
2016-01-18 12:30         ` [PATCH v2 05/10] virtio: " David Marchand
2016-01-18 12:30         ` [PATCH v2 06/10] vmxnet3: " David Marchand
2016-01-18 12:30         ` [PATCH v2 07/10] enic: " David Marchand
2016-01-18 12:30         ` [PATCH v2 08/10] bnx2x: " David Marchand
2016-01-18 12:30         ` [PATCH v2 09/10] pci: no need for global device ids list David Marchand
2016-01-18 12:30         ` [PATCH v2 10/10] pci: place all uio pci device ids in a dedicated section David Marchand
2016-01-19  7:30           ` Thomas Monjalon
2016-01-19 14:29             ` Neil Horman
2016-01-19 16:10               ` Stephen Hemminger
2016-01-19 20:56                 ` Neil Horman
2016-01-19 21:35                   ` Stephen Hemminger
2016-01-20 15:40                     ` Neil Horman
2016-02-24 11:37                       ` Bruce Richardson
2016-02-24 11:50                         ` Thomas Monjalon
2016-02-24 14:18                           ` Neil Horman
2016-04-20 12:43         ` [PATCH v3 00/13] kill global pci device id list David Marchand
2016-04-20 12:43           ` [PATCH v3 01/13] e1000: move pci device ids to driver David Marchand
2016-04-20 13:29             ` Neil Horman
2016-04-20 13:39               ` David Marchand
2016-04-20 18:15                 ` Neil Horman
2016-04-21  7:27                   ` David Marchand
2016-04-21 12:08                     ` Neil Horman
2016-04-21 12:41                       ` Thomas Monjalon
2016-04-22 12:13                         ` Neil Horman
2016-04-22 13:22                           ` Thomas Monjalon
2016-07-08 13:31             ` Thomas Monjalon
2016-07-11  5:33               ` Yuanhan Liu
2016-07-11  5:56                 ` Thomas Monjalon
2016-07-11  6:05                   ` Yuanhan Liu
2016-07-11 11:35                   ` David Marchand
2016-07-11 12:05                     ` Yuanhan Liu
2016-04-20 12:43           ` [PATCH v3 02/13] ixgbe: " David Marchand
2016-04-29  1:34             ` Wu, Jingjing
2016-05-04  8:26               ` David Marchand
2016-04-20 12:43           ` [PATCH v3 03/13] i40e: " David Marchand
2016-04-20 12:43           ` [PATCH v3 04/13] fm10k: " David Marchand
2016-04-20 12:43           ` [PATCH v3 05/13] virtio: " David Marchand
2016-04-20 12:43           ` [PATCH v3 06/13] vmxnet3: " David Marchand
2016-04-20 12:43           ` [PATCH v3 07/13] enic: " David Marchand
2016-04-20 12:43           ` [PATCH v3 08/13] bnx2x: " David Marchand
2016-04-20 12:43           ` [PATCH v3 09/13] ena: remove unneeded pci macro David Marchand
2016-04-20 12:43           ` [PATCH v3 10/13] pci: no need for global device ids list David Marchand
2016-04-20 12:43           ` [PATCH v3 11/13] drivers: constify pci id tables David Marchand
2016-04-20 12:43           ` [PATCH v3 12/13] drivers: export pci drivers David Marchand
2016-04-20 12:43           ` [PATCH v3 13/13] app: introduce dpdk-obj-info tool David Marchand
2016-04-21  8:07           ` [PATCH v3 00/13] kill global pci device id list David Marchand
2016-04-21 12:13             ` Neil Horman
2016-07-11 14:40           ` [PATCH v4 00/10] kill global pci device id list (almost) David Marchand
2016-07-11 14:40             ` [PATCH v4 01/10] eal: remove PCI device ids header from doxygen David Marchand
2016-07-11 14:40             ` [PATCH v4 02/10] net/e1000: move em PCI device ids to the driver David Marchand
2016-07-11 14:40             ` [PATCH v4 03/10] net/i40e: move " David Marchand
2016-07-11 14:40             ` [PATCH v4 04/10] net/fm10k: " David Marchand
2016-07-11 14:40             ` [PATCH v4 05/10] net/virtio: " David Marchand
2016-07-11 14:40             ` [PATCH v4 06/10] net/vmxnet3: " David Marchand
2016-07-11 14:40             ` [PATCH v4 07/10] net/enic: " David Marchand
2016-07-11 14:40             ` [PATCH v4 08/10] net/bnx2x: " David Marchand
2016-07-11 14:40             ` [PATCH v4 09/10] net/bnxt: " David Marchand
2016-07-11 14:40             ` [PATCH v4 10/10] net/ena: remove unneeded PCI macro David Marchand
2016-07-11 16:27             ` [PATCH v4 00/10] kill global pci device id list (almost) Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452430254-30390-9-git-send-email-david.marchand@6wind.com \
    --to=david.marchand@6wind.com \
    --cc=dev@dpdk.org \
    --cc=sony.chacko@qlogic.com \
    --cc=thomas.monjalon@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.