diff options
Diffstat (limited to 'recipes-extended/dpdk')
8 files changed, 67 insertions, 6 deletions
diff --git a/recipes-extended/dpdk/dpdk-20.11.inc b/recipes-extended/dpdk/dpdk-20.11.inc index 00aed60d..90b4c405 100644 --- a/recipes-extended/dpdk/dpdk-20.11.inc +++ b/recipes-extended/dpdk/dpdk-20.11.inc @@ -1,11 +1,11 @@ DESCRIPTION = "Data Plane Development Kit" HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1" SRCREV = "f74b8bd5ab1c6ff76e956fc202a56aea2d200270" S = "${WORKDIR}/git" diff --git a/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch b/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch index f19b2b32..f88b6484 100644 --- a/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch +++ b/recipes-extended/dpdk/dpdk-20.11/0001-drivers-net-enetfec-enet_uio.c-fix-multiple-definiti.patch @@ -7,6 +7,7 @@ Subject: [PATCH] drivers/net/enetfec/enet_uio.c: fix multiple definition .../examples/flow_classify/flow_classify.c:170: first defined here collect2: error: ld returned 1 exit status +Upstream-Status: Pending Signed-off-by: Ting Liu <ting.liu@nxp.com> --- drivers/net/enetfec/enet_uio.c | 2 +- diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f4c932ea..f2ab1370 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -14,7 +14,7 @@ COMPATIBLE_HOST:armv4 = 'null' COMPATIBLE_HOST:armv5 = 'null' COMPATIBLE_HOST:armv6 = 'null' -COMPATIBLE_MACHINE = "(imx|qoriq)" +COMPATIBLE_MACHINE = "(imx-nxp-bsp|qoriq)" DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" @@ -24,7 +24,7 @@ DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc" export RTE_TARGET = "${DPDK_RTE_TARGET}" export RTE_OUTPUT = "${S}/${RTE_TARGET}" -export MODULE_DIR = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" +export MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" S = "${WORKDIR}/git" @@ -117,3 +117,6 @@ FILES:${PN} += " ${datadir}/ \ FILES:${PN}-examples += " \ ${datadir}/examples/* \ " + +TOOLCHAIN = "gcc" + diff --git a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch index 5ee48a59..383b9085 100644 --- a/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch +++ b/recipes-extended/dpdk/dpdk/0001-Add-RTE_KERNELDIR_OUT.patch @@ -3,6 +3,7 @@ From: Chunrong Guo <chunrong.guo@nxp.com> Date: Wed, 3 Jul 2019 08:50:45 +0200 Subject: [PATCH] Add RTE_KERNELDIR_OUT +Upstream-Status: Pending Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> --- kernel/linux/kni/Makefile | 2 +- diff --git a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch index fa0eda87..b4b8a548 100644 --- a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch +++ b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch @@ -4,6 +4,7 @@ Date: Wed, 27 Mar 2019 09:35:43 +0100 Subject: [PATCH] add -Wno-cast-function-type Upstream-Status: Inappropriate [configuration] +Signed-off-by: "C.r. Guo" <nxa13725@lsv07005.swis.us-cdc01.nxp.com> --- examples/cmdif/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch new file mode 100644 index 00000000..b73b3a96 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch @@ -0,0 +1,49 @@ +From 229fc129be85a4d2d2c4efddae7bb97c3d87d416 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Mar 2023 22:02:01 -0700 +Subject: [PATCH] examples: fix Arm build with GCC 12 + +GCC-12 warns when a pointer of type union points to an array of same +defined size, as union internally gets paded with pad bytes. + + ../examples/common/neon/port_group.h:42:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} + [-Werror=array-bounds] + 42 | pnum->u64 = gptbl[v].pnum; + | ^~ + ../examples/common/neon/port_group.h:21:23: note: object 'pn' of + size [0, 10] + 21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1 + | ~~~~~~~~~^~~~~~~~~~~~~~~ + ../examples/common/neon/port_group.h:43:21: error: array subscript + 'union <anonymous>[0]' is partly outside array bounds of + 'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds] + 43 | pnum->u16[FWDSTEP] = 1; + | ^~ + +Fixes: 732115ce38c6 ("examples/l3fwd: move packet group function in common") + +Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/b269bd630e96b276a69d698e13ad9ebfbbb67512] +Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/l3fwd/l3fwd_neon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h +index 86ac5971d7..dc73e9fef7 100644 +--- a/examples/l3fwd/l3fwd_neon.h ++++ b/examples/l3fwd/l3fwd_neon.h +@@ -77,7 +77,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1, + union { + uint16_t u16[FWDSTEP + 1]; + uint64_t u64; +- } *pnum = (void *)pn; ++ } __rte_packed *pnum = (void *)pn; + + int32_t v; + uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0}; +-- +2.39.2 + diff --git a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch index 81ca1244..b1bdf09b 100644 --- a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch +++ b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch @@ -1,3 +1,8 @@ +Explicitly use python3 + +Upstream-Status: Pending +Signed-off-by: Ting Liu <ting.liu@nxp.com> + diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index 0194be046..86fe3a89d 100755 --- a/app/test-bbdev/test-bbdev.py diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb index 37582124..b14d4fbf 100644 --- a/recipes-extended/dpdk/dpdk_19.11-20.12.bb +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb @@ -1,13 +1,14 @@ -LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LICENSE = "BSD-3-Clause & LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1 \ file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://0001-add-Wno-cast-function-type.patch \ file://0001-Add-RTE_KERNELDIR_OUT.patch \ file://0005-use-python3-instead-of-python.patch \ + file://0001-examples-fix-Arm-build-with-GCC-12.patch \ " SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" |