[dpdk-dev] [PATCH v3 2/7] lib/librte_eal: Add PCI IDs for Broadcom bnxt

2016-04-19 Thread Bruce Richardson
On Fri, Mar 04, 2016 at 01:05:23PM -0800, Stephen Hurd wrote:
> Add Broadcom Vendor ID and RTE_PCI_DEV_ID_DECL_BNXT() macro.
> Add Device IDs for Broadcom bnxt devices.
> 
> Signed-off-by: Stephen Hurd 
> ---
>  lib/librte_eal/common/include/rte_pci_dev_ids.h | 45 
> ++---
>  1 file changed, 40 insertions(+), 5 deletions(-)
> 
> 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 d088191..9a8f254 100644
> --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
> +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h
> @@ -63,11 +63,11 @@
>   * This file contains a list of the PCI device IDs recognised by DPDK, which
>   * can be used to fill out an array of structures describing the devices.
>   *
> - * Currently four families of devices are recognised: those supported by the
> - * IGB driver, by EM driver, those supported by the IXGBE driver, and by 
> virtio
> - * driver which is a para virtualization driver running in guest virtual 
> machine.
> - * The inclusion of these in an array built using this file depends on the
> - * definition of
> + * Currently five families of devices are recognised: those supported by the
> + * IGB driver, by EM driver, those supported by the IXGBE driver, by BNXT
> + * driver, and by virtio driver which is a para virtualization driver running
> + * in guest virtual machine.  The inclusion of these in an array built using
> + * this file depends on the definition of
>   * RTE_PCI_DEV_ID_DECL_EM
>   * RTE_PCI_DEV_ID_DECL_IGB
>   * RTE_PCI_DEV_ID_DECL_IGBVF
> @@ -76,6 +76,7 @@
>   * RTE_PCI_DEV_ID_DECL_I40E
>   * RTE_PCI_DEV_ID_DECL_I40EVF
>   * RTE_PCI_DEV_ID_DECL_VIRTIO
> + * RTE_PCI_DEV_ID_DECL_BNXT
>   * at the time when this file is included.
>   *
>   * In order to populate an array, the user of this file must define this 
> macro:
> @@ -167,6 +168,15 @@
>  #define PCI_VENDOR_ID_VMWARE 0x15AD
>  #endif
>  
> +#ifndef PCI_VENDOR_ID_BROADCOM
> +/** Vendor ID used by Broadcom devices */
> +#define PCI_VENDOR_ID_BROADCOM 0x14E4
> +#endif
> +
> +#ifndef RTE_PCI_DEV_ID_DECL_BNXT
> +#define RTE_PCI_DEV_ID_DECL_BNXT(vendor, dev)
> +#endif
> +

This macro definition looks to be in the wrong place in the file. The device
definitions are all placed above the vendor declarations.

/Bruce


[dpdk-dev] [PATCH v3 2/7] lib/librte_eal: Add PCI IDs for Broadcom bnxt

2016-03-04 Thread Stephen Hurd
Add Broadcom Vendor ID and RTE_PCI_DEV_ID_DECL_BNXT() macro.
Add Device IDs for Broadcom bnxt devices.

Signed-off-by: Stephen Hurd 
---
 lib/librte_eal/common/include/rte_pci_dev_ids.h | 45 ++---
 1 file changed, 40 insertions(+), 5 deletions(-)

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 d088191..9a8f254 100644
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h
@@ -63,11 +63,11 @@
  * This file contains a list of the PCI device IDs recognised by DPDK, which
  * can be used to fill out an array of structures describing the devices.
  *
- * Currently four families of devices are recognised: those supported by the
- * IGB driver, by EM driver, those supported by the IXGBE driver, and by virtio
- * driver which is a para virtualization driver running in guest virtual 
machine.
- * The inclusion of these in an array built using this file depends on the
- * definition of
+ * Currently five families of devices are recognised: those supported by the
+ * IGB driver, by EM driver, those supported by the IXGBE driver, by BNXT
+ * driver, and by virtio driver which is a para virtualization driver running
+ * in guest virtual machine.  The inclusion of these in an array built using
+ * this file depends on the definition of
  * RTE_PCI_DEV_ID_DECL_EM
  * RTE_PCI_DEV_ID_DECL_IGB
  * RTE_PCI_DEV_ID_DECL_IGBVF
@@ -76,6 +76,7 @@
  * RTE_PCI_DEV_ID_DECL_I40E
  * RTE_PCI_DEV_ID_DECL_I40EVF
  * RTE_PCI_DEV_ID_DECL_VIRTIO
+ * RTE_PCI_DEV_ID_DECL_BNXT
  * at the time when this file is included.
  *
  * In order to populate an array, the user of this file must define this macro:
@@ -167,6 +168,15 @@
 #define PCI_VENDOR_ID_VMWARE 0x15AD
 #endif

+#ifndef PCI_VENDOR_ID_BROADCOM
+/** Vendor ID used by Broadcom devices */
+#define PCI_VENDOR_ID_BROADCOM 0x14E4
+#endif
+
+#ifndef RTE_PCI_DEV_ID_DECL_BNXT
+#define RTE_PCI_DEV_ID_DECL_BNXT(vendor, dev)
+#endif
+
 #ifndef PCI_VENDOR_ID_CISCO
 /** Vendor ID used by Cisco VIC devices */
 #define PCI_VENDOR_ID_CISCO 0x1137
@@ -592,6 +602,30 @@ RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, 
QUMRANET_DEV_ID_VIRTIO)

 RTE_PCI_DEV_ID_DECL_VMXNET3(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3)

+/** Broadcom BNXT devices **/
+
+#define BROADCOM_DEV_ID_57301  0x16c8
+#define BROADCOM_DEV_ID_57302  0x16c9
+#define BROADCOM_DEV_ID_57304_PF   0x16ca
+#define BROADCOM_DEV_ID_57304_VF   0x16cb
+#define BROADCOM_DEV_ID_57304_MF   0x16cc
+#define BROADCOM_DEV_ID_57402  0x16d0
+#define BROADCOM_DEV_ID_57404  0x16d1
+#define BROADCOM_DEV_ID_57406_PF   0x16d2
+#define BROADCOM_DEV_ID_57406_VF   0x16d3
+#define BROADCOM_DEV_ID_57406_MF   0x16d4
+
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57301)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57302)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_PF)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_VF)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_MF)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57402)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57404)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_PF)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_VF)
+RTE_PCI_DEV_ID_DECL_BNXT(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_MF)
+
 /*** Virtual FM10K devices from fm10k_type.h ***/

 #define FM10K_DEV_ID_VF   0x15A5
@@ -665,5 +699,6 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, 
BNX2X_DEV_ID_57840_MF)
 #undef RTE_PCI_DEV_ID_DECL_I40EVF
 #undef RTE_PCI_DEV_ID_DECL_VIRTIO
 #undef RTE_PCI_DEV_ID_DECL_VMXNET3
+#undef RTE_PCI_DEV_ID_DECL_BNXT
 #undef RTE_PCI_DEV_ID_DECL_FM10K
 #undef RTE_PCI_DEV_ID_DECL_FM10KVF
-- 
1.9.1