* [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe
@ 2017-03-17 7:51 Chunrong Guo
2017-03-17 7:51 ` [PATCH 2/8] ppfe-firmware: " Chunrong Guo
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw)
To: meta-freescale; +Cc: chunrong.guo
From: Chunrong Guo <chunrong.guo@nxp.com>
---
recipes-extended/dpdk/dpdk-extras_git.bb | 27 +++++++
...ys-sysmacros.h-for-major-minor-defintions.patch | 38 ++++++++++
.../add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 51 +++++++++++++
recipes-extended/dpdk/dpdk_16.07.bb | 85 ++++++++++++++++++++++
recipes-extended/ovs-dpdk/ovs-dpdk_0.1.bb | 49 +++++++++++++
5 files changed, 250 insertions(+)
create mode 100644 recipes-extended/dpdk/dpdk-extras_git.bb
create mode 100644 recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
create mode 100644 recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
create mode 100644 recipes-extended/dpdk/dpdk_16.07.bb
create mode 100644 recipes-extended/ovs-dpdk/ovs-dpdk_0.1.bb
diff --git a/recipes-extended/dpdk/dpdk-extras_git.bb b/recipes-extended/dpdk/dpdk-extras_git.bb
new file mode 100644
index 0000000..a18c467
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk-extras_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Data Plane Development Kit Extended utilities"
+HOMEPAGE = "http://dpdk.org"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
+
+RDEPENDS_${PN} = "dpdk"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/dpdk-extras.git;nobranch=1"
+SRCREV = "ebc515aad0605ad90d8ade5c1fde60d8da86973f"
+
+S = "${WORKDIR}/git"
+
+DPAA_VER ?= "dpaa2"
+DPAA_VER_fsl-lsch2 = "dpaa"
+
+do_install() {
+ install -d ${D}/${bindir}/dpdk-example/extras
+
+ for file_suffix in xml sh; do
+ if [ "`ls ${S}/${DPAA_VER}/*.${file_suffix}`" != "" ]; then
+ install -m 755 ${S}/${DPAA_VER}/*.${file_suffix} ${D}/${bindir}/dpdk-example/extras
+ fi
+ done
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a)"
diff --git a/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch b/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
new file mode 100644
index 0000000..c894044
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
@@ -0,0 +1,38 @@
+Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions
+
+glibc 2.25 is warning about it if applications depend on
+sys/types.h for these macros, it expects to be included
+from <sys/sysmacros.h>
+
+Fixes
+| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
+| by <sys/sysmacros.h>. For historical compatibility, it is
+| currently defined by <sys/types.h> as well, but we plan to
+| remove this soon. To use "minor", include <sys/sysmacros.h>
+| directly. If you did not intend to use a system-defined macro
+| "minor", you should undefine it after including <sys/types.h>. [-Werror]
+| Query.c: In function 'Query':
+| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
+| by <sys/sysmacros.h>. For historical compatibility, it is
+| currently defined by <sys/types.h> as well, but we plan to
+| remove this soon. To use "makedev", include <sys/sysmacros.h>
+| directly. If you did not intend to use a system-defined macro
+| "makedev", you should undefine it after including <sys/types.h>. [-Werror]
+| makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
+| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
+---
+Upstream-Status: Pending
+
+
+--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.cold 2017-02-27 17:36:15.984931159 +0800
++++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c 2017-02-27 17:36:57.520929721 +0800
+@@ -39,6 +39,7 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <linux/pci_regs.h>
++#include <sys/sysmacros.h>
+
+ #if defined(RTE_ARCH_X86)
+ #include <sys/io.h>
diff --git a/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
new file mode 100644
index 0000000..4657f07
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk/add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
@@ -0,0 +1,51 @@
+From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001
+From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+Date: Fri, 18 Dec 2015 18:30:47 +0800
+Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build
+ artifact
+
+Introduce RTE_KERNELDIR_OUT to be the path to which kernel build
+artifacts are located. This is for matching the workflow change
+since Yocto Project v1.8 onwards whereby tmp/work-shared contains
+separate directories for kernel source and kernel artifacts.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+---
+ mk/rte.module.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mk/rte.module.mk b/mk/rte.module.mk
+index 53ed4fe..b7a014b 100644
+--- a/mk/rte.module.mk
++++ b/mk/rte.module.mk
+@@ -77,7 +77,7 @@ build: _postbuild
+ # build module
+ $(MODULE).ko: $(SRCS_LINKS)
+ @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
+- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
+ CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
+
+ # install module in $(RTE_OUTPUT)/kmod
+@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
+
+ # install module
+ modules_install:
+- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
+ modules_install
+
+ .PHONY: clean
+@@ -98,7 +98,7 @@ clean: _postclean
+ .PHONY: doclean
+ doclean:
+ @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
+- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
++ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean
+ @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
+ if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
+ @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
+--
+1.9.1
diff --git a/recipes-extended/dpdk/dpdk_16.07.bb b/recipes-extended/dpdk/dpdk_16.07.bb
new file mode 100644
index 0000000..380ec39
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk_16.07.bb
@@ -0,0 +1,85 @@
+DESCRIPTION = "Data Plane Development Kit"
+HOMEPAGE = "http://dpdk.org"
+LICENSE = "BSD & LGPLv2 & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS += "virtual/kernel openssl"
+RDEPENDS_${PN} = "bash python"
+RDEPENDS_${PN}-examples = "bash python-core"
+
+inherit module
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/dpdk.git;nobranch=1 \
+ file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
+ file://a.patch \
+"
+SRCREV = "34b69f9ab1af11db43df2d616be1c1f20feef70b"
+
+S = "${WORKDIR}/git"
+
+DPAA_VER ?= "dpaa2"
+DPAA_VER_fsl-lsch2 = "dpaa"
+export RTE_TARGET = "${ARCH}-${DPAA_VER}-linuxapp-gcc"
+
+EXTRA_OEMAKE += 'ARCH="${ARCH}" CROSS="${TARGET_PREFIX}" \
+ CPU_CFLAGS="--sysroot=${STAGING_DIR_HOST}" RTE_SDK="${S}" \
+ OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
+ RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" \
+'
+
+do_configure[noexec] = "1"
+
+do_compile[depends] += "virtual/kernel:do_shared_workdir"
+do_compile() {
+ oe_runmake O="${RTE_TARGET}" T="${RTE_TARGET}" config
+}
+
+do_install() {
+ unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
+
+ oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" T="${RTE_TARGET}" DESTDIR="${D}" install
+
+ # Build and install the DPDK examples
+ for APP in examples/l2fwd examples/l3fwd examples/l2fwd-crypto examples/ipsec-secgw examples/kni; do
+ oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" -C ${APP}
+
+ [ ! -d ${D}/${bindir}/dpdk-example ] && install -d 0644 ${D}/${bindir}/dpdk-example
+ install -m 0755 ${S}/examples/`basename ${APP}`/build/`basename ${APP}` \
+ ${D}/${bindir}/dpdk-example/
+ done
+ install -m 0755 ${S}/${RTE_TARGET}/app/testpmd ${D}/${bindir}/dpdk-example/
+ rm -fr ${D}/lib/modules/*
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/dpdk
+ install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/dpdk/
+
+ sed -i 's#/bin/echo#/bin/bash#' ${D}/${datadir}/scripts/load-devel-config.sh
+ # rm ${S}/${RTE_TARGET}/app/dpdk-pmdinfogen
+ rm ${D}/${datadir}/${RTE_TARGET}/app/dpdk-pmdinfogen
+
+ chown root:root -R ${D}
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES += "${PN}-examples"
+
+FILES_${PN} += "${datadir}/tools /usr/bin/* /usr/sbin/*"
+FILES_${PN}-dbg += "${bindir}/dpdk-example/.debug \
+ ${datadir}/examples/kni/build/.debug \
+ ${datadir}/examples/kni/build/app/.debug \
+ ${datadir}/examples/l2fwd/build/.debug \
+ ${datadir}/examples/l2fwd/build/app/.debug \
+ ${datadir}/examples/l2fwd-crypto/build/.debug \
+ ${datadir}/examples/l2fwd-crypto/build/app/.debug \
+ ${datadir}/examples/l3fwd/build/.debug \
+ ${datadir}/examples/l3fwd/build/app/.debug \
+ ${datadir}/examples/ipsec-secgw/build/.debug \
+ ${datadir}/examples/ipsec-secgw/build/app/.debug \
+"
+FILES_${PN}-dev += "${datadir}/mk ${datadir}/scripts \
+ ${datadir}/${RTE_TARGET} \
+ ${includedir} \
+"
+FILES_${PN}-examples += "${datadir}/examples"
+
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a)"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_0.1.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_0.1.bb
new file mode 100644
index 0000000..472ac16
--- /dev/null
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_0.1.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "OVS DPDK"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=17b2c9d4c70853a09c0e143137754b35"
+
+DEPENDS = "dpdk python-six-native"
+RDEPENDS_${PN} = "bash libcrypto libssl python"
+
+inherit pythonnative
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/ovs-dpdk.git;nobranch=1"
+SRCREV = "84599fad4a10597fb4377174abdeb84b871cb4b0"
+
+S = "${WORKDIR}/git"
+
+DPAA_VER ?= "dpaa2"
+DPAA_VER_fsl-lsch2 = "dpaa"
+export RTE_TARGET = "${ARCH}-${DPAA_VER}-linuxapp-gcc"
+
+EXTRA_OEMAKE += 'ARCH="${ARCH}" CROSS="${TARGET_PREFIX}" \
+ CPU_CFLAGS="--sysroot=${STAGING_DIR_HOST}" RTE_SDK="${S}" \
+ OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
+ RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" \
+'
+
+do_configure() {
+ export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
+ ${S}/boot.sh
+ ${S}/configure --host aarch64-fsl-linux --with-dpdk=${SYSROOT_DPDK}/usr/share/${RTE_TARGET} --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast"
+}
+
+do_compile() {
+ oe_runmake O="${RTE_TARGET}" T="${RTE_TARGET}"
+}
+
+do_install() {
+ install -d ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk
+ cp -rf ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
+ chmod 777 -R ${D}${bindir}/ovs-dpdk/*
+}
+
+ALLOW_EMPTY_${PN} = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a)"
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/8] ppfe-firmware: add recipe 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 3/8] qemu-qoriq: upgrade to v2.6.2+ Chunrong Guo ` (5 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb new file mode 100644 index 0000000..f300419 --- /dev/null +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "PPFE Linux firmware" +LICENSE = "Freescale-Binary-EULA" +LIC_FILES_CHKSUM = "file://Freescale-Binary-EULA;md5=f1c407c0fccab5cd0bf9b92565f6f19b" + +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "git://git.freescale.com/ppc/sdk/engine-pfe-bin.git;nobranch=1" +SRCREV = "5d984557d9b542bdd8bd469537126c05dd167dcc" + +S = "${WORKDIR}/git" + +do_install () { + install -d ${D}/lib/firmware + install -m 644 ${S}/Freescale-Binary-EULA ${D}/lib/firmware + install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}/lib/firmware +} + +FILES_${PN} += "/lib/firmware" +INSANE_SKIP_${PN} += "arch already-stripped" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +COMPATIBLE_MACHINE = "(ls1012a)" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/8] qemu-qoriq: upgrade to v2.6.2+ 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo 2017-03-17 7:51 ` [PATCH 2/8] ppfe-firmware: " Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 4/8] usdpaa: update to 7dd9b4e Chunrong Guo ` (4 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> upgrade to v2.6.2, add support for ls1012a. Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-devtools/qemu/qemu-qoriq_git.bb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb index b9535d8..87662e1 100644 --- a/recipes-devtools/qemu/qemu-qoriq_git.bb +++ b/recipes-devtools/qemu/qemu-qoriq_git.bb @@ -20,13 +20,8 @@ QorIQ machines. The poky version should be used for native/nativesdk build." LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -# remove not supported PACKAGECONFIG by this recipe -PACKAGECONFIG[gcrypt] = "" -PACKAGECONFIG[nettle] = "" -PACKAGECONFIG[nss] = "" - -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v2.0.x" -SRCREV = "4b846e9b2b15660abace52dd27a406af08c4212d" +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1" +SRCREV = "ef54fffcee4324c9a32bf6e260c8141b4e6c542e" # add ptest patches SRC_URI_append = "\ -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/8] usdpaa: update to 7dd9b4e 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo 2017-03-17 7:51 ` [PATCH 2/8] ppfe-firmware: " Chunrong Guo 2017-03-17 7:51 ` [PATCH 3/8] qemu-qoriq: upgrade to v2.6.2+ Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 5/8] linux-qoriq: update to b14540e Chunrong Guo ` (3 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> New commits: 7dd9b4e Merge pull request #91 in SDK/usdpaa from ~B45764/usdpaa:jira/qman/QUSDPA-855-CLONE-usdpaa-query_wq_lengths to sdk-v2.0.x b49072e Merge pull request #92 in SDK/usdpaa from ~B45764/usdpaa:jira/qman/QUSDPA-859-usdpaa-QMan-query-cq-and-ccgr-lack-LE to sdk-v 1e94441 fsl_qbman: fix bman debugfs endianness a339cf0 fsl_qbman: fix kernel doc comments 4108116 fsl_qbman: ceetm: set the linked lni id for each channel 955ae82 fsl_qbman: ceetm: fix parsing of lni and sp id ranges 2e2cc21 fsl_qbman: ceetm: add missing endianness conversions b4f93c2 fsl_qman: Fix endianness in ccgr query 7a2cef7 fsl_qman: Fix endianness class queue query a978591 fsl_qbman: Fix endianness for wq query Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-dpaa/usdpaa/usdpaa_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb index 193d8ba..dde8fd9 100644 --- a/recipes-dpaa/usdpaa/usdpaa_git.bb +++ b/recipes-dpaa/usdpaa/usdpaa_git.bb @@ -7,8 +7,8 @@ inherit pkgconfig DEPENDS += "flib" -SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;branch=sdk-v2.0.x" -SRCREV = "a21c62ec9ac015f6c37f89d595e892852055b0fb" +SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;nobranch=1" +SRCREV = "7dd9b4eee5346729a83adad491dda979d55ac62b" S = "${WORKDIR}/git" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/8] linux-qoriq: update to b14540e 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo ` (2 preceding siblings ...) 2017-03-17 7:51 ` [PATCH 4/8] usdpaa: update to 7dd9b4e Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 6/8] rcw: update to 7bd43d9 Chunrong Guo ` (2 subsequent siblings) 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> * merged upstream v4.1.35 release. * support LS1012A * Includes additional workarounds for Chip Errata: A-010284, A-010150, A-008975 Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> --- .../CVE-2016-5696-limiting-of-all-challenge.patch | 111 --------------------- ...5696-make-challenge-acks-less-predictable.patch | 90 ----------------- recipes-kernel/linux/linux-qoriq_4.1.bb | 5 +- 3 files changed, 2 insertions(+), 204 deletions(-) delete mode 100644 recipes-kernel/linux/linux-qoriq/CVE-2016-5696-limiting-of-all-challenge.patch delete mode 100644 recipes-kernel/linux/linux-qoriq/CVE-2016-5696-make-challenge-acks-less-predictable.patch diff --git a/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-limiting-of-all-challenge.patch b/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-limiting-of-all-challenge.patch deleted file mode 100644 index d1f97cd..0000000 --- a/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-limiting-of-all-challenge.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 5413f1a526d2d51d7a5768133c90936c017165c6 Mon Sep 17 00:00:00 2001 -From: Jason Baron <jbaron@akamai.com> -Date: Thu, 14 Jul 2016 11:38:40 -0400 -Subject: [PATCH] tcp: enable per-socket rate limiting of all 'challenge acks' - -[ Upstream commit 083ae308280d13d187512b9babe3454342a7987e ] - -The per-socket rate limit for 'challenge acks' was introduced in the -context of limiting ack loops: - -commit f2b2c582e824 ("tcp: mitigate ACK loops for connections as tcp_sock") - -And I think it can be extended to rate limit all 'challenge acks' on a -per-socket basis. - -Since we have the global tcp_challenge_ack_limit, this patch allows for -tcp_challenge_ack_limit to be set to a large value and effectively rely on -the per-socket limit, or set tcp_challenge_ack_limit to a lower value and -still prevents a single connections from consuming the entire challenge ack -quota. - -It further moves in the direction of eliminating the global limit at some -point, as Eric Dumazet has suggested. This a follow-up to: -Subject: tcp: make challenge acks less predictable - -CVE: CVE-2016-5696 -Upstream-Status: Backport - -Cc: Eric Dumazet <edumazet@google.com> -Cc: David S. Miller <davem@davemloft.net> -Cc: Neal Cardwell <ncardwell@google.com> -Cc: Yuchung Cheng <ycheng@google.com> -Cc: Yue Cao <ycao009@ucr.edu> -Signed-off-by: Jason Baron <jbaron@akamai.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> -Signed-off-by: Adrian Dudau <adrian.dudau@enea.com> - ---- - net/ipv4/tcp_input.c | 39 ++++++++++++++++++++++----------------- - 1 file changed, 22 insertions(+), 17 deletions(-) - -diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 05f10df..12b98e2 100644 ---- a/net/ipv4/tcp_input.c -+++ b/net/ipv4/tcp_input.c -@@ -3390,6 +3390,23 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32 - return flag; - } - -+static bool __tcp_oow_rate_limited(struct net *net, int mib_idx, -+ u32 *last_oow_ack_time) -+{ -+ if (*last_oow_ack_time) { -+ s32 elapsed = (s32)(tcp_time_stamp - *last_oow_ack_time); -+ -+ if (0 <= elapsed && elapsed < sysctl_tcp_invalid_ratelimit) { -+ NET_INC_STATS_BH(net, mib_idx); -+ return true; /* rate-limited: don't send yet! */ -+ } -+ } -+ -+ *last_oow_ack_time = tcp_time_stamp; -+ -+ return false; /* not rate-limited: go ahead, send dupack now! */ -+} -+ - /* Return true if we're currently rate-limiting out-of-window ACKs and - * thus shouldn't send a dupack right now. We rate-limit dupacks in - * response to out-of-window SYNs or ACKs to mitigate ACK loops or DoS -@@ -3403,21 +3420,9 @@ bool tcp_oow_rate_limited(struct net *net, const struct sk_buff *skb, - /* Data packets without SYNs are not likely part of an ACK loop. */ - if ((TCP_SKB_CB(skb)->seq != TCP_SKB_CB(skb)->end_seq) && - !tcp_hdr(skb)->syn) -- goto not_rate_limited; -- -- if (*last_oow_ack_time) { -- s32 elapsed = (s32)(tcp_time_stamp - *last_oow_ack_time); -- -- if (0 <= elapsed && elapsed < sysctl_tcp_invalid_ratelimit) { -- NET_INC_STATS_BH(net, mib_idx); -- return true; /* rate-limited: don't send yet! */ -- } -- } -- -- *last_oow_ack_time = tcp_time_stamp; -+ return false; - --not_rate_limited: -- return false; /* not rate-limited: go ahead, send dupack now! */ -+ return __tcp_oow_rate_limited(net, mib_idx, last_oow_ack_time); - } - - /* RFC 5961 7 [ACK Throttling] */ -@@ -3430,9 +3435,9 @@ static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb) - u32 count, now; - - /* First check our per-socket dupack rate limit. */ -- if (tcp_oow_rate_limited(sock_net(sk), skb, -- LINUX_MIB_TCPACKSKIPPEDCHALLENGE, -- &tp->last_oow_ack_time)) -+ if (__tcp_oow_rate_limited(sock_net(sk), -+ LINUX_MIB_TCPACKSKIPPEDCHALLENGE, -+ &tp->last_oow_ack_time)) - return; - - /* Then check host-wide RFC 5961 rate limit. */ --- -1.9.1 - diff --git a/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-make-challenge-acks-less-predictable.patch b/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-make-challenge-acks-less-predictable.patch deleted file mode 100644 index 072671a..0000000 --- a/recipes-kernel/linux/linux-qoriq/CVE-2016-5696-make-challenge-acks-less-predictable.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 72c2d3bccaba4a0a4de354f9d2d24eccd05bfccf Mon Sep 17 00:00:00 2001 -From: Eric Dumazet <edumazet@google.com> -Date: Sun, 10 Jul 2016 10:04:02 +0200 -Subject: [PATCH] tcp: make challenge acks less predictable - -[ Upstream commit 75ff39ccc1bd5d3c455b6822ab09e533c551f758 ] - -Yue Cao claims that current host rate limiting of challenge ACKS -(RFC 5961) could leak enough information to allow a patient attacker -to hijack TCP sessions. He will soon provide details in an academic -paper. - -This patch increases the default limit from 100 to 1000, and adds -some randomization so that the attacker can no longer hijack -sessions without spending a considerable amount of probes. - -Based on initial analysis and patch from Linus. - -Note that we also have per socket rate limiting, so it is tempting -to remove the host limit in the future. - -v2: randomize the count of challenge acks per second, not the period. - -CVE: CVE-2016-5696 -Upstream-Status: Backport - -Fixes: 282f23c6ee34 ("tcp: implement RFC 5961 3.2") -Reported-by: Yue Cao <ycao009@ucr.edu> -Signed-off-by: Eric Dumazet <edumazet@google.com> -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Yuchung Cheng <ycheng@google.com> -Cc: Neal Cardwell <ncardwell@google.com> -Acked-by: Neal Cardwell <ncardwell@google.com> -Acked-by: Yuchung Cheng <ycheng@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> -Signed-off-by: Adrian Dudau <adrian.dudau@enea.com> - ---- - net/ipv4/tcp_input.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index d4c5115..05f10df 100644 ---- a/net/ipv4/tcp_input.c -+++ b/net/ipv4/tcp_input.c -@@ -89,7 +89,7 @@ int sysctl_tcp_adv_win_scale __read_mostly = 1; - EXPORT_SYMBOL(sysctl_tcp_adv_win_scale); - - /* rfc5961 challenge ack rate limiting */ --int sysctl_tcp_challenge_ack_limit = 100; -+int sysctl_tcp_challenge_ack_limit = 1000; - - int sysctl_tcp_stdurg __read_mostly; - int sysctl_tcp_rfc1337 __read_mostly; -@@ -3427,7 +3427,7 @@ static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb) - static u32 challenge_timestamp; - static unsigned int challenge_count; - struct tcp_sock *tp = tcp_sk(sk); -- u32 now; -+ u32 count, now; - - /* First check our per-socket dupack rate limit. */ - if (tcp_oow_rate_limited(sock_net(sk), skb, -@@ -3435,13 +3435,18 @@ static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb) - &tp->last_oow_ack_time)) - return; - -- /* Then check the check host-wide RFC 5961 rate limit. */ -+ /* Then check host-wide RFC 5961 rate limit. */ - now = jiffies / HZ; - if (now != challenge_timestamp) { -+ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1; -+ - challenge_timestamp = now; -- challenge_count = 0; -+ WRITE_ONCE(challenge_count, half + -+ prandom_u32_max(sysctl_tcp_challenge_ack_limit)); - } -- if (++challenge_count <= sysctl_tcp_challenge_ack_limit) { -+ count = READ_ONCE(challenge_count); -+ if (count > 0) { -+ WRITE_ONCE(challenge_count, count - 1); - NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK); - tcp_send_ack(sk); - } --- -1.9.1 - diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bb b/recipes-kernel/linux/linux-qoriq_4.1.bb index 587ecd9..6c2b235 100644 --- a/recipes-kernel/linux/linux-qoriq_4.1.bb +++ b/recipes-kernel/linux/linux-qoriq_4.1.bb @@ -13,12 +13,10 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \ file://fix-the-compile-issue-under-gcc6.patch \ file://only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch \ file://powerpc-fsl-Fix-build-of-the-dtb-embedded-kernel-images.patch \ - file://CVE-2016-5696-limiting-of-all-challenge.patch \ - file://CVE-2016-5696-make-challenge-acks-less-predictable.patch \ file://CVE-2016-2053.patch \ file://CVE-2016-0758.patch \ " -SRCREV = "4004071c129a776136e71f6a85383fea87f5db75" +SRCREV = "b14540ee315f79f6a5dfc621e7f4217c8fac7d1c" S = "${WORKDIR}/git" @@ -37,6 +35,7 @@ SCMVERSION ?= "y" LOCALVERSION = "" DELTA_KERNEL_DEFCONFIG ?= "" DELTA_KERNEL_DEFCONFIG_prepend_qoriq-arm64 = "freescale.config " +DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "freescale_aarch32.config " do_merge_delta_config() { # copy desired defconfig so we pick it up for the real kernel_do_configure -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/8] rcw: update to 7bd43d9 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo ` (3 preceding siblings ...) 2017-03-17 7:51 ` [PATCH 5/8] linux-qoriq: update to b14540e Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 7/8] ls2-rcw: update to 83a7a66 Chunrong Guo 2017-03-17 7:51 ` [PATCH 8/8] ls2-rcw: fix host-user-contaminated QA warning Chunrong Guo 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> ls1046ardb: increase FMan and platform frequency Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-bsp/rcw/rcw_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index e00c0a6..9fafa02 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -7,8 +7,8 @@ DEPENDS += "change-file-endianess-native tcl-native" inherit deploy -SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=sdk-v2.0.x" -SRCREV = "3252b8cce8e5a214c8e652121ef9b9460663c65a" +SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;nobranch=1" +SRCREV = "7bd43d920065171a8d805a3d02fa4c0b39885664" S = "${WORKDIR}/git" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/8] ls2-rcw: update to 83a7a66 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo ` (4 preceding siblings ...) 2017-03-17 7:51 ` [PATCH 6/8] rcw: update to 7bd43d9 Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 2017-03-17 7:51 ` [PATCH 8/8] ls2-rcw: fix host-user-contaminated QA warning Chunrong Guo 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> * add support for ls1012a. * strip possible '-32b', '-64b' and '-be' to match folder name. New commits: 83a7a66 ls1088a: Remove ls1088 directory 585f03e ls208xa: Make folders and name consistent 6a7a0e5 ls2088a: Delete ls2088a rcws as it is not part of SDK f358729 ls1012a: Make folders and name consistent 5b5695f ls1012a: Add support of RCW for FRDM, RDB and QDS boards Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-bsp/rcw/ls2-rcw_git.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes-bsp/rcw/ls2-rcw_git.bb b/recipes-bsp/rcw/ls2-rcw_git.bb index 8a0c130..fafd914 100644 --- a/recipes-bsp/rcw/ls2-rcw_git.bb +++ b/recipes-bsp/rcw/ls2-rcw_git.bb @@ -3,27 +3,29 @@ DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the LICENSE = "Freescale-Binary-EULA" LIC_FILES_CHKSUM = "file://Freescale-Binary-EULA;md5=8835a59e50213e1b21243dd00c933e47" -inherit deploy +inherit deploy siteinfo INHIBIT_DEFAULT_DEPS = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "git://git.freescale.com/ppc/sdk/ls2-rcw.git;nobranch=1" -SRCREV = "8a050e0779a9d03ea488d01cc1a31d1e2b1efdba" +SRCREV = "83a7a661404b760874759073c9f14c8c2c8a9af3" S = "${WORKDIR}/git" +M="${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}" + do_install () { install -d ${D}/boot/rcw - cp -r ${S}/ls2080a/RDB/* ${D}/boot/rcw + cp -a ${S}/${M} ${D}/boot/rcw/ } do_deploy () { install -d ${DEPLOYDIR}/rcw - cp -r ${S}/ls2080a/RDB/* ${DEPLOYDIR}/rcw + cp -a ${S}/${M} ${DEPLOYDIR}/rcw/ } addtask deploy before do_build after do_install PACKAGES += "${PN}-image" FILES_${PN}-image += "/boot" -COMPATIBLE_MACHINE = "(ls2080ardb)" +COMPATIBLE_MACHINE = "(ls1012a|ls2080a)" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 8/8] ls2-rcw: fix host-user-contaminated QA warning 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo ` (5 preceding siblings ...) 2017-03-17 7:51 ` [PATCH 7/8] ls2-rcw: update to 83a7a66 Chunrong Guo @ 2017-03-17 7:51 ` Chunrong Guo 6 siblings, 0 replies; 8+ messages in thread From: Chunrong Guo @ 2017-03-17 7:51 UTC (permalink / raw) To: meta-freescale; +Cc: chunrong.guo From: Ting Liu <ting.liu@nxp.com> Signed-off-by: Ting Liu <ting.liu@nxp.com> --- recipes-bsp/rcw/ls2-rcw_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-bsp/rcw/ls2-rcw_git.bb b/recipes-bsp/rcw/ls2-rcw_git.bb index fafd914..70d27a0 100644 --- a/recipes-bsp/rcw/ls2-rcw_git.bb +++ b/recipes-bsp/rcw/ls2-rcw_git.bb @@ -18,6 +18,7 @@ M="${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','').replace('- do_install () { install -d ${D}/boot/rcw cp -a ${S}/${M} ${D}/boot/rcw/ + chown -R root:root ${D} } do_deploy () { -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-03-17 8:06 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-03-17 7:51 [PATCH 1/8] dpdk/dpdk-extras/ovs-dpdk: add recipe Chunrong Guo 2017-03-17 7:51 ` [PATCH 2/8] ppfe-firmware: " Chunrong Guo 2017-03-17 7:51 ` [PATCH 3/8] qemu-qoriq: upgrade to v2.6.2+ Chunrong Guo 2017-03-17 7:51 ` [PATCH 4/8] usdpaa: update to 7dd9b4e Chunrong Guo 2017-03-17 7:51 ` [PATCH 5/8] linux-qoriq: update to b14540e Chunrong Guo 2017-03-17 7:51 ` [PATCH 6/8] rcw: update to 7bd43d9 Chunrong Guo 2017-03-17 7:51 ` [PATCH 7/8] ls2-rcw: update to 83a7a66 Chunrong Guo 2017-03-17 7:51 ` [PATCH 8/8] ls2-rcw: fix host-user-contaminated QA warning Chunrong Guo
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.