diff mbox

[2/2] linux-generic: dpdk: bump target dpdk version to 16.04

Message ID 1461838907-16842-2-git-send-email-matias.elo@nokia.com
State Accepted
Commit a555042f369b223532908d23588e12f37fcc0ecc
Headers show

Commit Message

Elo, Matias (Nokia - FI/Espoo) April 28, 2016, 10:21 a.m. UTC 
Change target dpdk version to 16.04 and add init functions
for the new drivers.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
---
 DEPENDENCIES                        |  2 +-
 platform/linux-generic/pktio/dpdk.c | 20 ++++++++++++++++++++
 scripts/build-pktio-dpdk            |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/DEPENDENCIES b/DEPENDENCIES
index c83fc36..be80f53 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -165,7 +165,7 @@  Prerequisites for building the OpenDataPlane (ODP) API
 
 3.4.1 Building DPDK and ODP with DPDK pktio support
 
-   DPDK packet I/O has been tested to work with DPDK v2.2.0.
+   DPDK packet I/O has been tested to work with DPDK v16.04.
 
    Follow steps in ./scripts/build-pktio-dpdk
 
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index db13cd2..4f33c9b 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -29,7 +29,10 @@  static odp_bool_t dpdk_initialized;
 #define PMD_EXT(drv) \
 extern void devinitfn_##drv(void)
 
+PMD_EXT(aesni_gcm_pmd_drv);
 PMD_EXT(cryptodev_aesni_mb_pmd_drv);
+PMD_EXT(cryptodev_null_pmd_drv);
+PMD_EXT(cryptodev_snow3g_pmd_drv);
 PMD_EXT(pmd_qat_drv);
 PMD_EXT(pmd_af_packet_drv);
 PMD_EXT(rte_bnx2x_driver);
@@ -39,6 +42,7 @@  PMD_EXT(rte_cxgbe_driver);
 PMD_EXT(em_pmd_drv);
 PMD_EXT(pmd_igb_drv);
 PMD_EXT(pmd_igbvf_drv);
+PMD_EXT(ena_pmd_drv);
 PMD_EXT(rte_enic_driver);
 PMD_EXT(rte_fm10k_driver);
 PMD_EXT(rte_i40e_driver);
@@ -54,6 +58,7 @@  PMD_EXT(pmd_null_drv);
 PMD_EXT(pmd_pcap_drv);
 PMD_EXT(pmd_ring_drv);
 PMD_EXT(pmd_szedata2_drv);
+PMD_EXT(pmd_vhost_drv);
 PMD_EXT(rte_virtio_driver);
 PMD_EXT(rte_vmxnet3_driver);
 PMD_EXT(pmd_xenvirt_drv);
@@ -66,9 +71,18 @@  PMD_EXT(pmd_xenvirt_drv);
 void refer_constructors(void);
 void refer_constructors(void)
 {
+#ifdef RTE_LIBRTE_PMD_AESNI_GCM
+	devinitfn_aesni_gcm_pmd_drv();
+#endif
 #ifdef RTE_LIBRTE_PMD_AESNI_MB
 	devinitfn_cryptodev_aesni_mb_pmd_drv();
 #endif
+#ifdef RTE_LIBRTE_PMD_NULL_CRYPTO
+	devinitfn_cryptodev_null_pmd_drv();
+#endif
+#ifdef RTE_LIBRTE_PMD_SNOW3G
+	devinitfn_cryptodev_snow3g_pmd_drv();
+#endif
 #ifdef RTE_LIBRTE_PMD_QAT
 	devinitfn_pmd_qat_drv();
 #endif
@@ -92,6 +106,9 @@  void refer_constructors(void)
 	devinitfn_pmd_igb_drv();
 	devinitfn_pmd_igbvf_drv();
 #endif
+#ifdef RTE_LIBRTE_ENA_PMD
+	devinitfn_ena_pmd_drv();
+#endif
 #ifdef RTE_LIBRTE_ENIC_PMD
 	devinitfn_rte_enic_driver();
 #endif
@@ -131,6 +148,9 @@  void refer_constructors(void)
 #ifdef RTE_LIBRTE_PMD_SZEDATA2
 	devinitfn_pmd_szedata2_drv();
 #endif
+#ifdef RTE_LIBRTE_PMD_VHOST
+	devinitfn_pmd_vhost_drv();
+#endif
 #ifdef RTE_LIBRTE_VIRTIO_PMD
 	devinitfn_rte_virtio_driver();
 #endif
diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk
index 7bf979f..53f703a 100755
--- a/scripts/build-pktio-dpdk
+++ b/scripts/build-pktio-dpdk
@@ -12,7 +12,7 @@  fi
 
 git clone http://dpdk.org/git/dpdk dpdk
 pushd dpdk
-git checkout -b bv2.2.0 v2.2.0
+git checkout -b bv16.04 v16.04
 
 #Make and edit DPDK configuration
 make config T=${TARGET} O=${TARGET}