From 84c049b9cb80b50fd32b716c2ae97e3f0d4e3cd7 Mon Sep 17 00:00:00 2001 From: WU CHIA CHUAN Date: Mon, 28 Sep 2015 16:03:16 +0800 Subject: meta-intel: meta-romley BSP retirement from YP 2.0 Remove meta-romley BSP layer from meta-intel master branch which is targeting for YP 2.0. A heads-up email was sent to the meta-intel mailing list for requesting any feedback regarding retirement of these BSP. Since there is no concern, we assume that it is agreed upon and thus this patch to retire the BSP. The "MAINTAINERS file" and "conf/machine/README file" are updated to reflect removal of the BSP. We expect intel-corei7-64 machine is continued to be used to support the platform and dpdk recipe under meta-romley is now supported under meta-isg/common/recipes-extended/dpdk. Signed-off-by: WU CHIA CHUAN Signed-off-by: Saul Wold --- MAINTAINERS | 4 - conf/machine/README | 1 - meta-isg/common/recipes-extended/dpdk/dpdk.inc | 2 - meta-romley/COPYING.MIT | 17 - meta-romley/README | 199 ----------- meta-romley/README.sources | 17 - meta-romley/binary/.gitignore | 0 meta-romley/conf/layer.conf | 12 - meta-romley/conf/machine/romley-ivb.conf | 20 -- meta-romley/conf/machine/romley.conf | 20 -- .../formfactor/formfactor/romley-ivb/machconfig | 3 - .../formfactor/formfactor/romley/machconfig | 3 - .../recipes-bsp/formfactor/formfactor_0.0.bbappend | 1 - meta-romley/recipes-extended/dpdk/dpdk.inc | 140 -------- ...ix-build-switches-to-enable-cmdline-tests.patch | 53 --- ...dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch | 35 -- ...k-1.6.0r2-examples-qos_sched-fix-makefile.patch | 35 -- ...d-config-variables-to-enable-disable-dpdk.patch | 42 --- ...examples-pipeline-build-with-all-examples.patch | 34 -- ...e-extra-devices-creation-with-vdev-option.patch | 44 --- .../dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch | 380 --------------------- meta-romley/recipes-extended/dpdk/dpdk_1.6.0r2.bb | 45 --- meta-romley/recipes-extended/dpdk/dpdk_1.7.0.bb | 41 --- 23 files changed, 1148 deletions(-) delete mode 100644 meta-romley/COPYING.MIT delete mode 100644 meta-romley/README delete mode 100644 meta-romley/README.sources delete mode 100644 meta-romley/binary/.gitignore delete mode 100644 meta-romley/conf/layer.conf delete mode 100644 meta-romley/conf/machine/romley-ivb.conf delete mode 100644 meta-romley/conf/machine/romley.conf delete mode 100644 meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig delete mode 100644 meta-romley/recipes-bsp/formfactor/formfactor/romley/machconfig delete mode 100644 meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk.inc delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-Add-config-variables-to-enable-disable-dpdk.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk_1.6.0r2.bb delete mode 100644 meta-romley/recipes-extended/dpdk/dpdk_1.7.0.bb diff --git a/MAINTAINERS b/MAINTAINERS index 233fa2eb..79a021dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -35,10 +35,6 @@ CRYSTALFOREST M: Wu Chia Chuan F: meta-crystalforest/ -ROMLEY -M: Wu Chia Chuan -F: meta-romley/ - TLK M: Saul Wold F: meta-tlk/ diff --git a/conf/machine/README b/conf/machine/README index 4bab5c14..47d66286 100644 --- a/conf/machine/README +++ b/conf/machine/README @@ -29,7 +29,6 @@ For intel-corei7-64: crystalforest-gladden haswell-wc nuc (Ivy Bridge and Haswell, manual audio config required) - romley sugarbay For intel-core2-32: diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index da481fce..e08594c9 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc @@ -53,8 +53,6 @@ def get_dpdk_target_mach(bb, d): "mohonpeak64": "atm", "mohonpeak32": "atm", "crystalforest": "ivb", - "romley": "snd", - "romley-ivb": "ivb", "intel_corei7_64": "hsw", } diff --git a/meta-romley/COPYING.MIT b/meta-romley/COPYING.MIT deleted file mode 100644 index fb950dc6..00000000 --- a/meta-romley/COPYING.MIT +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/meta-romley/README b/meta-romley/README deleted file mode 100644 index acdcb99d..00000000 --- a/meta-romley/README +++ /dev/null @@ -1,199 +0,0 @@ -This README file contains information on building the meta-romley -BSP layer, and booting the images contained in the /binary directory. -Please see the corresponding sections below for details. - -The romley platform consists of two versions: -1. romley - Sandy Bridge -2. romley - Ivy Bridge - -The romley - Sandy Bridge platform consists of the Intel Xeon E5-2600 -and E5-2400 Series processors, plus the Intel C604/C602-J chipset -(Sandy Bridge-EP/EN + Patsburg). - -The romley - Ivy Bridge platform consists of the Intel Xeon E5-2600 -and E5-2400 v2 Series processors with the Intel C604/C602-J chipset -(Ivy Bridge-EP/EN + Patsburg). - -This BSP assumes Matrox graphics is being used. - -Further information about the platforms supported by this BSP can be -found here: - - http://www.intel.com/p/en_US/embedded/hwsw/hardware/xeon-e5-c604/overview - -Information on all Intel® embedded platforms can be found here: - - http://www.intel.com/p/en_US/embedded/hwsw/hardware - - -Yocto Project Compatible -======================== - -This BSP is compatible with the Yocto Project as per the requirements -listed here: - - https://www.yoctoproject.org/webform/yocto-project-compatible-registration - - -Dependencies -============ - -This layer depends on: - - URI: git://git.openembedded.org/bitbake - branch: master - - URI: git://git.openembedded.org/openembedded-core - layers: meta - branch: master - - URI: git://git.yoctoproject.org/meta-intel - layers: intel - branch: master - - -Patches -======= - -Please submit any patches against this BSP to the meta-intel mailing -list (meta-intel@yoctoproject.org) and cc: the maintainer: - -Maintainer: Chan Wei Sern - -Please see the meta-intel/MAINTAINERS file for more details. - - -Table of Contents -================= - - I. Building the meta-romley BSP layer - II. Booting the images in /binary -III. Device Notes - a. Boot Loader - b. I/O drivers -IV. Enabling Intel DPDK Technology - -I. Building the meta-romley BSP layer -======================================= - -In order to build an image with BSP support for a given release, you -need to download the corresponding BSP tarball from the 'Board Support -Package (BSP) Downloads' page of the Yocto Project website. - -Having done that, and assuming you extracted the BSP tarball contents -at the top-level of your yocto build tree, you can build a romley -image by adding the location of the meta-romley layer to -bblayers.conf, along with the meta-intel layer itself (to access -common metadata shared between BSPs) e.g.: - - yocto/meta-intel \ - yocto/meta-intel/meta-romley \ - -To enable the romley Sandy Bridge layer, add the romley MACHINE to local.conf: - - MACHINE ?= "romley" - -To enable the romley Ivy Bridge layer, add the romley-ivb MACHINE to local.conf: - - MACHINE ?= "romley-ivb" - -You should then be able to build a romley image as such: - - $ source oe-init-build-env - $ bitbake core-image-sato - -At the end of a successful build, you should have a live image that -you can boot from a USB flash drive (see instructions on how to do -that below, in the section 'Booting the images from /binary'). - -As an alternative to downloading the BSP tarball, you can also work -directly from the meta-intel git repository. For each BSP in the -'meta-intel' repository, there are multiple branches, one -corresponding to each major release starting with 'laverne' (0.90), in -addition to the latest code which tracks the current master (note that -not all BSPs are present in every release). Instead of extracting a -BSP tarball at the top level of your yocto build tree, you can -equivalently check out the appropriate branch from the meta-intel -repository at the same location. - - -II. Booting the images in /binary -================================= - -This BSP contains bootable live images, which can be used to directly -boot Yocto off of a USB flash drive. - -Under Linux, insert a USB flash drive. Assuming the USB flash drive -takes device /dev/sdf, use dd to copy the live image to it. For -example: - -# dd if=core-image-sato-romley.hddimg of=/dev/sdf -# sync -# eject /dev/sdf - -This should give you a bootable USB flash device. Insert the device -into a bootable USB socket on the target, and power on. This should -result in a system booted to the Sato graphical desktop. - -If you want a terminal, use the arrows at the top of the UI to move to -different pages of available applications, one of which is named -'Terminal'. Clicking that should give you a root terminal. - -If you want to ssh into the system, you can use the root terminal to -ifconfig the IP address and use that to ssh in. The root password is -empty, so to log in type 'root' for the user name and hit 'Enter' at -the Password prompt: and you should be in. - -If you're using Rose City and does not have ME firmware and struggling with -rebooting the machine. This is because broken ME firmware can contribute to long wait of -reboot. We have to changing the kernel command line to blacklist MEI driver to be loaded: - -1. Open your syslinux in VI editor eg: - # vi /media/sda/syslinux.cfg - -2. Look for the line that has kernel command line which has certain similiarity - as below: - - "APPEND initrd=/initrd LABEL=boot root=/dev/ram0 ....." - - or - - "APPEND initrd=/initrd LABEL=install root=/dev/ram0 ...." - -3. Add "mei_me.blacklist=yes"at the end of that line and it will be like below: - "APPEND inird=/initRD LABEL=boot root=/dev/ram0 .... mei_me.blacklist=yes" - -4. Save this syslinux.cfg - -5. Boot up the Romley with this new changed. - - -III. Device Notes -================= - -a. Boot Loader --------------- -- Support BIOS version at RoseCity board :RMLCRB.86J.R0.45.D018 - -b. I/O drivers --------------- --Support Matrox graphic card. --Support SATA, USB Host v2.0 --Supported I/O devices (APIC, RTC, SPI, UART, I2C, LPS, SMBus i801, - WDT, and HPET) - -IV. Enabling Intel DPDK Technology -=================================== - -There are recipes available for the 'Intel Data Plane Development Kit -Technology components for use with this BSP. Please contact your -Intel Field Sales Representative or visit Intel Embedded Design -Center (www.intel.com/p/en_US/embedded/designcenter) for instructions on how -to locate and use these recipes. ----- - -If you find you're getting corrupt images on the USB (it doesn't show -the syslinux boot: prompt, or the boot: prompt contains strange -characters), try doing this first: - -# dd if=/dev/zero of=/dev/sdf bs=1M count=512 diff --git a/meta-romley/README.sources b/meta-romley/README.sources deleted file mode 100644 index 0d4d849a..00000000 --- a/meta-romley/README.sources +++ /dev/null @@ -1,17 +0,0 @@ -The sources for the packages comprising the images shipped with this -BSP can be found at the following location: - -http://downloads.yoctoproject.org/mirror/sources/ - -The metadata used to generate the images shipped with this BSP, in -addition to the code contained in this BSP, can be found at the -following location: - -http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2 - -The metadata used to generate the images shipped with this BSP, in -addition to the code contained in this BSP, can also be found at the -following locations: - -git://git.yoctoproject.org/poky.git -git://git.yoctoproject.org/meta-intel diff --git a/meta-romley/binary/.gitignore b/meta-romley/binary/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/meta-romley/conf/layer.conf b/meta-romley/conf/layer.conf deleted file mode 100644 index 7b6a5bc3..00000000 --- a/meta-romley/conf/layer.conf +++ /dev/null @@ -1,12 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "romley" -BBFILE_PATTERN_romley := "^${LAYERDIR}/" -BBFILE_PRIORITY_romley = "6" - -LAYERDEPENDS_romley = "intel" diff --git a/meta-romley/conf/machine/romley-ivb.conf b/meta-romley/conf/machine/romley-ivb.conf deleted file mode 100644 index 9d7bff6c..00000000 --- a/meta-romley/conf/machine/romley-ivb.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: romley-ivb - -#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 v2 Series (Formerly Ivy Bridge-EP/EN) -#Processors with Intel C604/C602-J Chipset (Romley-EP/EN Platform) - -#@DESCRIPTION: Machine configuration for Romley systems -# i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J - - -PREFERRED_VERSION_linux-yocto ?= "3.14%" - -require conf/machine/include/intel-corei7-64-common.inc -require conf/machine/include/intel-common-pkgarch.inc -require conf/machine/include/meta-intel.inc - -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ - ${XSERVER_X86_MATROX_MGA} \ - " diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf deleted file mode 100644 index 14f34b0a..00000000 --- a/meta-romley/conf/machine/romley.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: romley - -#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 Series (Formerly Sandy Bridge-EP/EN) -#Processors with Intel C604/C602-J Chipset (Romley-EP/EN Platform) - -#@DESCRIPTION: Machine configuration for Romley systems -# i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J - - -PREFERRED_VERSION_linux-yocto ?= "3.14%" - -require conf/machine/include/intel-corei7-64-common.inc -require conf/machine/include/intel-common-pkgarch.inc -require conf/machine/include/meta-intel.inc - -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ - ${XSERVER_X86_MATROX_MGA} \ - " diff --git a/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig b/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-romley/recipes-bsp/formfactor/formfactor/romley/machconfig b/meta-romley/recipes-bsp/formfactor/formfactor/romley/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-romley/recipes-bsp/formfactor/formfactor/romley/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 72d991c7..00000000 --- a/meta-romley/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-romley/recipes-extended/dpdk/dpdk.inc b/meta-romley/recipes-extended/dpdk/dpdk.inc deleted file mode 100644 index 0547c7e8..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk.inc +++ /dev/null @@ -1,140 +0,0 @@ -DESCRIPTION = "Intel(r) Data Plane Development Kit" -HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD & LGPLv2 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" - -COMPATIBLE_MACHINE = "romley|romley-ivb" - -RDEPENDS_${PN} += "python-subprocess" - -inherit module - -export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" -export RTE_SDK = "${S}" -export RTE_TARGET="${TARGET_ARCH}-ivshmem-${TARGET_OS}app-gcc" -export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" -export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" -export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" -export INSTALL_PATH = "${prefix}/dpdk" - - -do_configure () { - ############################################################# - ### default value for prefix is "usr", unsetting it, so it - ### will not be concatenated in ${RTE_TARGET}/Makefile - ### which will cause compilation failure - ############################################################# - unset prefix - - make O=$RTE_TARGET T=$RTE_TARGET config - -} - - -do_compile () { - unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS - - cd ${S}/${RTE_TARGET} - oe_runmake EXTRA_LDFLAGS=" --sysroot=${STAGING_DIR_HOST}" \ - EXTRA_CFLAGS=" --sysroot=${STAGING_DIR_HOST}" \ - CROSS="${TARGET_PREFIX}" \ - prefix="" LDFLAGS="" WERROR_FLAGS="-w" V=1 - -} - - -do_install () { - - install -m 0755 -d ${D}/${INSTALL_PATH} \ - ${D}/${INSTALL_PATH}/doc \ - ${D}/${INSTALL_PATH}/tools \ - ${D}/${INSTALL_PATH}/${RTE_TARGET} \ - ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \ - ${D}${includedir} \ - ${D}${includedir}/arch \ - ${D}${includedir}/exec-env \ - ${D}${libdir} \ - ${D}${MODULE_DIR} - - install -m 0755 ${S}/${RTE_TARGET}/kmod/igb_uio.ko ${D}${MODULE_DIR}/ - install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko ${D}${MODULE_DIR}/ - - install -m 640 ${S}/${RTE_TARGET}/lib/*.a ${D}${libdir} - - install -m 640 ${S}/${RTE_TARGET}/.config ${D}/${INSTALL_PATH}/${RTE_TARGET}/ - install -m 640 ${S}/${RTE_TARGET}/include/*.h ${D}${includedir}/ - install -m 640 ${S}/${RTE_TARGET}/include/arch/* ${D}${includedir}/arch/ - install -m 640 ${S}/${RTE_TARGET}/include/exec-env/* ${D}${includedir}/exec-env/ - install -m 0755 ${S}/tools/*.py ${D}/${INSTALL_PATH}/tools/ - - - #Install test applications - install -m 0755 ${S}/${RTE_TARGET}/app/test ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${S}/${RTE_TARGET}/app/testpmd ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${S}/${RTE_TARGET}/app/dump_cfg ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${S}/${RTE_TARGET}/app/cmdline_test ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - - - # Install example applications - # It is expected that user of this include file should define EXAMPLES_BUILD_DIR - for app in ${S}/examples/* - do - case `basename ${app}` in - "dpdk_qat" | "vhost" | "vhost_xen" | "Makefile" ) continue - ;; - "l2fwd-ivshmem") - install -m 0755 ${app}/guest/${EXAMPLES_BUILD_DIR}/app/guest ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${app}/host/${EXAMPLES_BUILD_DIR}/app/host ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - "multi_process") - install -m 0755 ${app}/client_server_mp/mp_client/${EXAMPLES_BUILD_DIR}/app/mp_client ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${app}/client_server_mp/mp_server/${EXAMPLES_BUILD_DIR}/app/mp_server ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${app}/simple_mp/${EXAMPLES_BUILD_DIR}/app/simple_mp ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${app}/symmetric_mp/${EXAMPLES_BUILD_DIR}/app/symmetric_mp ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - "netmap_compat") - install -m 0755 ${app}/bridge/${EXAMPLES_BUILD_DIR}/app/bridge ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - "quota_watermark") - install -m 0755 ${app}/qw/${EXAMPLES_BUILD_DIR}/app/qw ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - install -m 0755 ${app}/qwctl/${EXAMPLES_BUILD_DIR}/app/qwctl ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - "vmdq") - install -m 0755 ${app}/${EXAMPLES_BUILD_DIR}/app/`basename ${app}`_app ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - "vmdq_dcb") - install -m 0755 ${app}/${EXAMPLES_BUILD_DIR}/app/`basename ${app}`_app ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - continue - ;; - esac - - install -m 0755 ${app}/${EXAMPLES_BUILD_DIR}/app/`basename ${app}` ${D}/${INSTALL_PATH}/${RTE_TARGET}/app - done -} - -PACKAGES += "${PN}-examples" - -FILES_${PN}-dbg += " \ - ${INSTALL_PATH}/.debug \ - ${INSTALL_PATH}/${RTE_TARGET}/app/.debug \ - " - -FILES_${PN}-doc += "\ - ${INSTALL_PATH}/doc \ - " - -FILES_${PN}-dev += " \ - ${INSTALL_PATH}/${RTE_TARGET}/.config \ - ${includedir} \ - ${includedir}/arch \ - ${includedir}/exec-env \ - " - -FILES_${PN} += " ${INSTALL_PATH}/tools/ " - -FILES_${PN}-examples += " ${INSTALL_PATH}/${RTE_TARGET}/app/ " diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch deleted file mode 100644 index 87d2ef77..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cf953d2bfa7df9aa67459b333db4d4d8a9e72fd6 Mon Sep 17 00:00:00 2001 -From: Thomas Monjalon -Date: Fri, 27 Jun 2014 11:21:11 +0200 -Subject: [PATCH] app/test: fix build switches to enable cmdline tests - -Upstream-Status: backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -There were 2 typos since these commits (in 1.6.0 releases): - 21a7f4e264 fix build without librte_cmdline - cac6d08c8b replace --use-device option by --pci-whitelist and --vdev -In makefiles, the build options are prefixed with CONFIG_RTE_ -but in .c file, it is only RTE_. - -These typos were disabling cmdline unit tests and test of "--vdev eth_ring" option. - -Signed-off-by: Thomas Monjalon -Acked-by: Pablo de Lara -Signed-off-by: Chan Wei Sern ---- - app/test/test_cmdline.c | 2 +- - app/test/test_eal_flags.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/app/test/test_cmdline.c b/app/test/test_cmdline.c -index 77475c4..10a3f77 100644 ---- a/app/test/test_cmdline.c -+++ b/app/test/test_cmdline.c -@@ -39,7 +39,7 @@ - int - test_cmdline(void) - { --#ifdef CONFIG_RTE_LIBRTE_CMDLINE -+#ifdef RTE_LIBRTE_CMDLINE - printf("Testind parsing ethernet addresses...\n"); - if (test_parse_etheraddr_valid() < 0) - return -1; -diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c -index a862654..1b80b80 100644 ---- a/app/test/test_eal_flags.c -+++ b/app/test/test_eal_flags.c -@@ -317,7 +317,7 @@ test_whitelist_flag(void) - const char *wlval3[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1", - pci_whitelist, "09:0B.3,type=test", - pci_whitelist, "08:00.1,type=normal", --#ifdef CONFIG_RTE_LIBRTE_PMD_RING -+#ifdef RTE_LIBRTE_PMD_RING - vdev, "eth_ring,arg=test", - #endif - }; --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch deleted file mode 100644 index e724591e..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From be1816f59e772e427fc5815281f9458a9314973a Mon Sep 17 00:00:00 2001 -From: Pablo de Lara -Date: Thu, 19 Jun 2014 16:35:22 +0100 -Subject: [PATCH] eal: fix option --base-virtaddr - -Upstream-Status: backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -When parsing EAL option --base-virtaddr -errno was not being set to 0 before calling strtoull, -therefore function might fail unnecesarily. - -Signed-off-by: Pablo de Lara -Signed-off-by: Aaron Campbell -Acked-by: Anatoly Burakov -Signed-off-by: Chan Wei Sern ---- - lib/librte_eal/linuxapp/eal/eal.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c -index 6994303..d204387 100644 ---- a/lib/librte_eal/linuxapp/eal/eal.c -+++ b/lib/librte_eal/linuxapp/eal/eal.c -@@ -562,6 +562,7 @@ eal_parse_base_virtaddr(const char *arg) - char *end; - uint64_t addr; - -+ errno = 0; - addr = strtoull(arg, &end, 16); - - /* check for errors */ --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch deleted file mode 100644 index 47b5ece7..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ea9a59b26c3c86b498337e968ee8f68c4e263614 Mon Sep 17 00:00:00 2001 -From: Olivier Matz -Date: Fri, 16 May 2014 10:18:59 +0200 -Subject: [PATCH] examples/qos_sched: fix makefile - -Upstream-Status: backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -The example does not compile as the linker complains about duplicated -symbols. - -Remove -lsched from LDLIBS, it is already present in rte.app.mk and -added by the DPDK framework automatically. - -Signed-off-by: Olivier Matz -Acked-by: Thomas Monjalon -Signed-off-by: Chan Wei Sern ---- - examples/qos_sched/Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile -index b91fe37..9366efe 100755 ---- a/examples/qos_sched/Makefile -+++ b/examples/qos_sched/Makefile -@@ -54,6 +54,4 @@ CFLAGS += $(WERROR_FLAGS) - CFLAGS_args.o := -D_GNU_SOURCE - CFLAGS_cfg_file.o := -D_GNU_SOURCE - --LDLIBS += -lrte_sched -- - include $(RTE_SDK)/mk/rte.extapp.mk --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-Add-config-variables-to-enable-disable-dpdk.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-Add-config-variables-to-enable-disable-dpdk.patch deleted file mode 100644 index d0721ca0..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-Add-config-variables-to-enable-disable-dpdk.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 63f8ccc5a305b193e219d288ef9e43b9a9fa6aa8 Mon Sep 17 00:00:00 2001 -From: Sreeju Selvaraj -Date: Wed, 17 Sep 2014 19:10:01 +0800 -Subject: [PATCH] examples: Add config variables to enable/disable dpdk_qat and - vhost - -Upstream-Status: Inappropriate [configuration] - -This can be used to export CONFIG_EXAMPLE_DPDK_QAT=n if dpdk_qat is not -in PACKAGECONFIG and also allow to export CONFIG_EXAMPLE_DPDK_VHOST=n -if vhost is not in PACKAGECONFIG. - -Signed-off-by: Sreeju Selvaraj ---- - examples/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/Makefile b/examples/Makefile -index d0624f6..885c938 100644 ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -39,7 +39,7 @@ include $(RTE_SDK)/mk/rte.vars.mk - - DIRS-y += cmdline - ifneq ($(ICP_ROOT),) --DIRS-y += dpdk_qat -+DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat - endif - DIRS-y += exception_path - DIRS-y += helloworld -@@ -61,7 +61,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter - DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched - DIRS-y += quota_watermark - DIRS-y += timer --DIRS-y += vhost -+DIRS-$(CONFIG_EXAMPLE_DPDK_VHOST) += vhost - DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen - DIRS-y += vmdq - DIRS-y += vmdq_dcb --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch deleted file mode 100644 index 25f029fe..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 15aef6e666ee2eb0befa153d277d47754f3656e4 Mon Sep 17 00:00:00 2001 -From: Thomas Monjalon -Date: Thu, 17 Jul 2014 10:30:52 +0200 -Subject: [PATCH] examples/pipeline: build with all examples - -Upstream-Status: Backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -When adding this packet framework sample (commit 77a3346), -it has been forgotten to add it into the global makefile for -"make examples". - -Signed-off-by: Thomas Monjalon -(cherry picked from commit a6664a09a7caa5e63f9ae625cf1946b0eef7794e) -Signed-off-by: Sreeju Selvaraj ---- - examples/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/Makefile b/examples/Makefile -index 885c938..1788d6e 100644 ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -43,6 +43,7 @@ DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat - endif - DIRS-y += exception_path - DIRS-y += helloworld -+DIRS-y += ip_pipeline - DIRS-y += ip_reassembly - DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ip_fragmentation - DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_multicast --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch deleted file mode 100644 index 25a4ea80..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 70d3d9a6757e0c56ad3c6da0292479433e16aed3 Mon Sep 17 00:00:00 2001 -From: Pablo de Lara -Date: Wed, 9 Jul 2014 15:35:35 +0100 -Subject: [PATCH] ring: remove extra devices creation with --vdev option - -Upstream-Status: Backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -When passing extra arguments in EAL option --vdev, to create -ring ethdevs, API was creating three ethdevs, even if there -was just one argument, such as CREATE. - -Signed-off-by: Pablo de Lara -Acked-by: Neil Horman -(cherry picked from commit 546afbc6827f9f0f7ed501d2af1fc51755e40224) -Signed-off-by: Sreeju Selvaraj ---- - lib/librte_pmd_ring/rte_eth_ring.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c -index 73c649e..4f1b6ed 100644 ---- a/lib/librte_pmd_ring/rte_eth_ring.c -+++ b/lib/librte_pmd_ring/rte_eth_ring.c -@@ -493,7 +493,6 @@ rte_pmd_ring_devinit(const char *name, const char *params) - eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); - return 0; - } else { -- eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); - ret = rte_kvargs_count(kvlist, ETH_RING_NUMA_NODE_ACTION_ARG); - info = rte_zmalloc("struct node_action_list", sizeof(struct node_action_list) + - (sizeof(struct node_action_pair) * ret), 0); -@@ -510,7 +509,7 @@ rte_pmd_ring_devinit(const char *name, const char *params) - goto out_free; - - for (info->count = 0; info->count < info->total; info->count++) { -- eth_dev_ring_pair_create(name, info->list[info->count].node, -+ eth_dev_ring_create(name, info->list[info->count].node, - info->list[info->count].action); - } - } --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch b/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch deleted file mode 100644 index c17137b2..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch +++ /dev/null @@ -1,380 +0,0 @@ -From 545a5fac5d6bd0b64693dfcb15b321280418ac13 Mon Sep 17 00:00:00 2001 -From: Pablo de Lara -Date: Wed, 9 Jul 2014 15:35:36 +0100 -Subject: [PATCH] ring: simplify unit tests - -Upstream-Status: Backport -Imported patch from: http://dpdk.org/browse/dpdk/log/ - -As this unit test does not create devices anymore, -and uses devices created by EAL option --vdev, -there were unnecesary tests that were repeated, -so they have been removed. - -So now there are three tests: - -1 - Test two devices that share a ring, one device - with just one RX queue and the other with one - TX queue. - -2 - Test a device connected to itself (loopback) by - a ring, with both RX and TX queue. - -3 - Test two devices that share a ring, but both devices - with RX and TX queue, so they can send packets to themselves - and to the other device. - -Signed-off-by: Pablo de Lara -Acked-by: Neil Horman -(cherry picked from commit 572eb3cd834c5e21d7fa946432b89c1c9d63fe61) -Signed-off-by: Sreeju Selvaraj ---- - app/test/test_pmd_ring.c | 202 +++++++++++++++++------------------------------ - 1 file changed, 72 insertions(+), 130 deletions(-) - -diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c -index 0d3d95c..19ad0e9 100644 ---- a/app/test/test_pmd_ring.c -+++ b/app/test/test_pmd_ring.c -@@ -39,18 +39,13 @@ - #include - #include - --/* two test rings, r1 is used by two ports, r2 just by one */ --static struct rte_ring *r1[2], *r2; -- - static struct rte_mempool *mp; --static uint8_t start_idx; /* will store the port id of the first of our new ports */ -- --#define TX_PORT (uint8_t)(start_idx + 1) --#define RX_PORT (uint8_t)(start_idx + 2) --#define RXTX_PORT (uint8_t)(start_idx + 3) --#define RXTX_PORT2 (uint8_t)(start_idx + 4) --#define RXTX_PORT4 (uint8_t)(start_idx + 6) --#define RXTX_PORT5 (uint8_t)(start_idx + 7) -+ -+#define TX_PORT 0 -+#define RX_PORT 1 -+#define RXTX_PORT 2 -+#define RXTX_PORT2 3 -+#define RXTX_PORT3 4 - #define SOCKET0 0 - - #define RING_SIZE 256 -@@ -86,7 +81,7 @@ test_ethdev_configure(void) - return -1; - } - if (rte_eth_dev_configure(RXTX_PORT, 1, 1, &null_conf) < 0) { -- printf("Configure failed for RX port\n"); -+ printf("Configure failed for RXTX port\n"); - return -1; - } - -@@ -250,197 +245,162 @@ test_stats_reset(void) - } - - static int --test_pmd_ring_init(void) -+test_pmd_ring_pair_create_attach(void) - { -- struct rte_eth_stats stats; -+ struct rte_eth_stats stats, stats2; - struct rte_mbuf buf, *pbuf = &buf; - struct rte_eth_conf null_conf; - -- printf("Testing ring pmd init\n"); -- -- if (RXTX_PORT2 >= RTE_MAX_ETHPORTS) { -+ if ((RXTX_PORT2 >= RTE_MAX_ETHPORTS) || (RXTX_PORT3 >= RTE_MAX_ETHPORTS)) { - printf(" TX/RX port exceed max eth ports\n"); - return -1; - } -- if (rte_eth_dev_configure(RXTX_PORT2, 1, 1, &null_conf) < 0) { -+ if ((rte_eth_dev_configure(RXTX_PORT2, 1, 1, &null_conf) < 0) -+ || (rte_eth_dev_configure(RXTX_PORT3, 1, 1, &null_conf) < 0)) { - printf("Configure failed for RXTX port\n"); - return -1; - } - -- if (rte_eth_tx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL) < 0) { -+ if ((rte_eth_tx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL) < 0) -+ || (rte_eth_tx_queue_setup(RXTX_PORT3, 0, RING_SIZE, SOCKET0, NULL) < 0)) { - printf("TX queue setup failed\n"); - return -1; - } - -- if (rte_eth_rx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, -- NULL, mp) < 0) { -+ if ((rte_eth_rx_queue_setup(RXTX_PORT2, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) -+ || (rte_eth_rx_queue_setup(RXTX_PORT3, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) { - printf("RX queue setup failed\n"); - return -1; - } - -- if (rte_eth_dev_start(RXTX_PORT2) < 0) { -- printf("Error starting RX port\n"); -+ if ((rte_eth_dev_start(RXTX_PORT2) < 0) -+ || (rte_eth_dev_start(RXTX_PORT3) < 0)) { -+ printf("Error starting RXTX port\n"); - return -1; - } - -- /* send and receive 1 packet and check for stats update */ -+ /* -+ * send and receive 1 packet (RXTX_PORT2 -> RXTX_PORT3) -+ * and check for stats update -+ */ - if (rte_eth_tx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) { - printf("Error sending packet to RXTX port\n"); - return -1; - } - -- if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) { -+ if (rte_eth_rx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) { - printf("Error receiving packet from RXTX port\n"); - return -1; - } - - rte_eth_stats_get(RXTX_PORT2, &stats); -- if (stats.ipackets != 1 || stats.opackets != 1 || -+ rte_eth_stats_get(RXTX_PORT3, &stats2); -+ if (stats.ipackets != 0 || stats.opackets != 1 || - stats.ibytes != 0 || stats.obytes != 0 || - stats.ierrors != 0 || stats.oerrors != 0) { - printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- rte_eth_dev_stop(RXTX_PORT2); -- -- return 0; --} -- --static int --test_pmd_ring_pair_create(void) --{ -- struct rte_eth_stats stats, stats2; -- struct rte_mbuf buf, *pbuf = &buf; -- struct rte_eth_conf null_conf; -- -- if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) { -- printf(" TX/RX port exceed max eth ports\n"); -- return -1; -- } -- if ((rte_eth_dev_configure(RXTX_PORT4, 1, 1, &null_conf) < 0) -- || (rte_eth_dev_configure(RXTX_PORT5, 1, 1, &null_conf) < 0)) { -- printf("Configure failed for RXTX port\n"); -- return -1; -- } -- -- if ((rte_eth_tx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL) < 0) -- || (rte_eth_tx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL) < 0)) { -- printf("TX queue setup failed\n"); -- return -1; -- } -- -- if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) -- || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) { -- printf("RX queue setup failed\n"); -- return -1; -- } -- -- if ((rte_eth_dev_start(RXTX_PORT4) < 0) -- || (rte_eth_dev_start(RXTX_PORT5) < 0)) { -- printf("Error starting RXTX port\n"); -+ if (stats2.ipackets != 1 || stats2.opackets != 0 || -+ stats2.ibytes != 0 || stats2.obytes != 0 || -+ stats2.ierrors != 0 || stats2.oerrors != 0) { -+ printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- /* send and receive 1 packet and check for stats update */ -- if (rte_eth_tx_burst(RXTX_PORT4, 0, &pbuf, 1) != 1) { -+ /* -+ * send and receive 1 packet (RXTX_PORT3 -> RXTX_PORT2) -+ * and check for stats update -+ */ -+ if (rte_eth_tx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) { - printf("Error sending packet to RXTX port\n"); - return -1; - } - -- if (rte_eth_rx_burst(RXTX_PORT5, 0, &pbuf, 1) != 1) { -+ if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) { - printf("Error receiving packet from RXTX port\n"); - return -1; - } - -- rte_eth_stats_get(RXTX_PORT4, &stats); -- rte_eth_stats_get(RXTX_PORT5, &stats2); -- if (stats.ipackets != 0 || stats.opackets != 1 || -+ rte_eth_stats_get(RXTX_PORT2, &stats); -+ rte_eth_stats_get(RXTX_PORT3, &stats2); -+ if (stats.ipackets != 1 || stats.opackets != 1 || - stats.ibytes != 0 || stats.obytes != 0 || - stats.ierrors != 0 || stats.oerrors != 0) { - printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- if (stats2.ipackets != 1 || stats2.opackets != 0 || -+ if (stats2.ipackets != 1 || stats2.opackets != 1 || - stats2.ibytes != 0 || stats2.obytes != 0 || - stats2.ierrors != 0 || stats2.oerrors != 0) { - printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- rte_eth_dev_stop(RXTX_PORT4); -- rte_eth_dev_stop(RXTX_PORT5); -- -- return 0; --} -- --static int --test_pmd_ring_pair_attach(void) --{ -- struct rte_eth_stats stats, stats2; -- struct rte_mbuf buf, *pbuf = &buf; -- struct rte_eth_conf null_conf; -- -- if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) { -- printf(" TX/RX port exceed max eth ports\n"); -- return -1; -- } -- if ((rte_eth_dev_configure(RXTX_PORT4, 1, 1, &null_conf) < 0) -- || (rte_eth_dev_configure(RXTX_PORT5, 1, 1, &null_conf) < 0)) { -- printf("Configure failed for RXTX port\n"); -+ /* -+ * send and receive 1 packet (RXTX_PORT2 -> RXTX_PORT2) -+ * and check for stats update -+ */ -+ if (rte_eth_tx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) { -+ printf("Error sending packet to RXTX port\n"); - return -1; - } - -- if ((rte_eth_tx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL) < 0) -- || (rte_eth_tx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL) < 0)) { -- printf("TX queue setup failed\n"); -+ if (rte_eth_rx_burst(RXTX_PORT2, 0, &pbuf, 1) != 1) { -+ printf("Error receiving packet from RXTX port\n"); - return -1; - } - -- if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) -- || (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) { -- printf("RX queue setup failed\n"); -+ rte_eth_stats_get(RXTX_PORT2, &stats); -+ rte_eth_stats_get(RXTX_PORT3, &stats2); -+ if (stats.ipackets != 2 || stats.opackets != 2 || -+ stats.ibytes != 0 || stats.obytes != 0 || -+ stats.ierrors != 0 || stats.oerrors != 0) { -+ printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- if ((rte_eth_dev_start(RXTX_PORT4) < 0) -- || (rte_eth_dev_start(RXTX_PORT5) < 0)) { -- printf("Error starting RXTX port\n"); -+ if (stats2.ipackets != 1 || stats2.opackets != 1 || -+ stats2.ibytes != 0 || stats2.obytes != 0 || -+ stats2.ierrors != 0 || stats2.oerrors != 0) { -+ printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- rte_eth_stats_reset(RXTX_PORT4); -- rte_eth_stats_reset(RXTX_PORT5); -- -- /* send and receive 1 packet and check for stats update */ -- if (rte_eth_tx_burst(RXTX_PORT4, 0, &pbuf, 1) != 1) { -+ /* -+ * send and receive 1 packet (RXTX_PORT3 -> RXTX_PORT3) -+ * and check for stats update -+ */ -+ if (rte_eth_tx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) { - printf("Error sending packet to RXTX port\n"); - return -1; - } -- if (rte_eth_rx_burst(RXTX_PORT5, 0, &pbuf, 1) != 1) { -+ -+ if (rte_eth_rx_burst(RXTX_PORT3, 0, &pbuf, 1) != 1) { - printf("Error receiving packet from RXTX port\n"); - return -1; - } - -- rte_eth_stats_get(RXTX_PORT4, &stats); -- rte_eth_stats_get(RXTX_PORT5, &stats2); -- if (stats.ipackets != 0 || stats.opackets != 1 || -+ rte_eth_stats_get(RXTX_PORT2, &stats); -+ rte_eth_stats_get(RXTX_PORT3, &stats2); -+ if (stats.ipackets != 2 || stats.opackets != 2 || - stats.ibytes != 0 || stats.obytes != 0 || - stats.ierrors != 0 || stats.oerrors != 0) { - printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- if (stats2.ipackets != 1 || stats2.opackets != 0 || -+ if (stats2.ipackets != 2 || stats2.opackets != 2 || - stats2.ibytes != 0 || stats2.obytes != 0 || - stats2.ierrors != 0 || stats2.oerrors != 0) { - printf("Error: RXTX port stats are not as expected\n"); - return -1; - } - -- rte_eth_dev_stop(RXTX_PORT4); -- rte_eth_dev_stop(RXTX_PORT5); -+ rte_eth_dev_stop(RXTX_PORT2); -+ rte_eth_dev_stop(RXTX_PORT3); - - return 0; - } -@@ -448,17 +408,6 @@ test_pmd_ring_pair_attach(void) - int - test_pmd_ring(void) - { -- r1[0] = rte_ring_create("R1", RING_SIZE, 0, 0); -- r1[1] = rte_ring_create("R2", RING_SIZE, 0, 0); -- if (r1[0] == NULL && (r1[0] = rte_ring_lookup("R1")) == NULL) -- return -1; -- if (r1[1] == NULL && (r1[1] = rte_ring_lookup("R2")) == NULL) -- return -1; -- -- r2 = rte_ring_create("R3", RING_SIZE, 0, RING_F_SP_ENQ|RING_F_SC_DEQ); -- if (r2 == NULL && (r2 = rte_ring_lookup("R3")) == NULL) -- return -1; -- - mp = rte_mempool_create("mbuf_pool", NB_MBUF, - MBUF_SIZE, 32, - sizeof(struct rte_pktmbuf_pool_private), -@@ -468,8 +417,6 @@ test_pmd_ring(void) - if (mp == NULL) - return -1; - -- start_idx = rte_eth_dev_count(); -- - if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\ - || (RXTX_PORT >= RTE_MAX_ETHPORTS)) { - printf(" TX/RX port exceed max eth ports\n"); -@@ -492,14 +439,9 @@ test_pmd_ring(void) - rte_eth_dev_stop(TX_PORT); - rte_eth_dev_stop(RXTX_PORT); - -- if (test_pmd_ring_init() < 0) -+ if (test_pmd_ring_pair_create_attach() < 0) - return -1; - -- if (test_pmd_ring_pair_create() < 0) -- return -1; -- -- if (test_pmd_ring_pair_attach() < 0) -- return -1; - return 0; - } - --- -1.9.1 - diff --git a/meta-romley/recipes-extended/dpdk/dpdk_1.6.0r2.bb b/meta-romley/recipes-extended/dpdk/dpdk_1.6.0r2.bb deleted file mode 100644 index 72f57683..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk_1.6.0r2.bb +++ /dev/null @@ -1,45 +0,0 @@ -include dpdk.inc - - -SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ - file://dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch \ - file://dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch \ - file://dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch \ - " - - -SRC_URI[dpdk.md5sum] = "f406d027320fc8e724bff20db5397cbb" -SRC_URI[dpdk.sha256sum] = "e72fdebcf8a899fc58e60c9b6493b7457576eece60b08dea6aee96c9087df4b2" - -export EXAMPLES_BUILD_DIR = "build" - -do_compile_append () { - - ################################################################### - ### Compilation for examples - ### Skip dpdk_qat due to it has dependency with qat source code - ### Skip vhost due to it has dependency to fuse libraries - ### Skip vhost_xen due to it has dependency to xen libraries - ################################################################### - for app in ${S}/examples/* - do - - [ `basename ${app}` = "dpdk_qat" -o `basename ${app}` = "vhost" -o `basename ${app}` = "vhost_xen" ] && continue; - - cd ${app} - - ############################################################### - # netmap_compat is putting the binary in a directory path - # which is different from rest of the example apps, so this - # special case is handled here to avoid installation failure - # with dpdk-1.6.0 - ############################################################### - if [ `basename ${app}` == "netmap_compat" ]; then - oe_runmake CROSS="${TARGET_PREFIX}" O="${app}/bridge/${EXAMPLES_BUILD_DIR}/" - else - oe_runmake CROSS="${TARGET_PREFIX}" - fi - done - -} - diff --git a/meta-romley/recipes-extended/dpdk/dpdk_1.7.0.bb b/meta-romley/recipes-extended/dpdk/dpdk_1.7.0.bb deleted file mode 100644 index 581f1d4a..00000000 --- a/meta-romley/recipes-extended/dpdk/dpdk_1.7.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -include dpdk.inc - -SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ - file://dpdk-1.7.0-examples-Add-config-variables-to-enable-disable-dpdk.patch \ - file://dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch \ - file://dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch \ - file://dpdk-1.7.0-ring-simplify-unit-tests.patch \ - " - -SRC_URI[dpdk.md5sum] = "07907d7b1a64888a459a971c45818038" -SRC_URI[dpdk.sha256sum] = "aafc290260b5002d248ab8f8c8ffa76454d4b1382aa3c82ae2700ecce481397a" - -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" - -# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. -# fuse is in meta-filesystems and qat is not yet upstreamed. -# So adding mechanism to explicitly disable the use of fuse and qat. -# To enable, uncomment the below line or include in .bbappend. -# PACKAGECONFIG ?= " dpdk_qat vhost " - -PACKAGECONFIG[dpdk_qat] = ",,qat" -PACKAGECONFIG[vhost] = ",,fuse" - -do_compile_append () { - - cd ${S}/examples/ - - # Disable the compilation of example apps dpdk_qat and vhost if they are - # not included in the PACKAGECONFIG - export CONFIG_EXAMPLE_DPDK_QAT=${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)} - export CONFIG_EXAMPLE_DPDK_VHOST="${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" - - ############################################################### - # In order to make use of dpdk.inc for example app installation - # without failure, override the default build directory - ############################################################### - oe_runmake CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/" -} - - - -- cgit v1.2.3-54-g00ecf