From patchwork Thu Apr 28 10:21:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elo, Matias \(Nokia - FI/Espoo\)" X-Patchwork-Id: 66883 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp125374qge; Thu, 28 Apr 2016 03:22:02 -0700 (PDT) X-Received: by 10.107.25.68 with SMTP id 65mr17828920ioz.98.1461838921976; Thu, 28 Apr 2016 03:22:01 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id ie9si12220319igb.83.2016.04.28.03.21.57; Thu, 28 Apr 2016 03:22:01 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: by lists.linaro.org (Postfix, from userid 109) id 7CCD661586; Thu, 28 Apr 2016 10:21:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8F81A61570; Thu, 28 Apr 2016 10:21:52 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D530C61579; Thu, 28 Apr 2016 10:21:50 +0000 (UTC) Received: from demumfd001.nsn-inter.net (demumfd001.nsn-inter.net [93.183.12.32]) by lists.linaro.org (Postfix) with ESMTPS id 8C5CE6156E for ; Thu, 28 Apr 2016 10:21:49 +0000 (UTC) Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u3SALmf6022163 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Apr 2016 10:21:48 GMT Received: from 10.144.19.15 ([10.144.104.109]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u3SALlcK014144 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Thu, 28 Apr 2016 12:21:48 +0200 From: Matias Elo To: lng-odp@lists.linaro.org Date: Thu, 28 Apr 2016 13:21:47 +0300 Message-Id: <1461838907-16842-2-git-send-email-matias.elo@nokia.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461838907-16842-1-git-send-email-matias.elo@nokia.com> References: <1461838907-16842-1-git-send-email-matias.elo@nokia.com> X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 3217 X-purgate-ID: 151667::1461838908-00001B3D-A35154A3/0/0 X-Topics: patch Subject: [lng-odp] [PATCH 2/2] linux-generic: dpdk: bump target dpdk version to 16.04 X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Change target dpdk version to 16.04 and add init functions for the new drivers. Signed-off-by: Matias Elo --- DEPENDENCIES | 2 +- platform/linux-generic/pktio/dpdk.c | 20 ++++++++++++++++++++ scripts/build-pktio-dpdk | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) 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}