diff options
Diffstat (limited to 'recipes-extended/dpdk')
-rw-r--r-- | recipes-extended/dpdk/dpdk.inc | 2 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/0001-examples-fix-Arm-build-with-GCC-12.patch | 49 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk_19.11-20.12.bb | 1 |
3 files changed, 51 insertions, 1 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 0dd08205..f2ab1370 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc | |||
@@ -24,7 +24,7 @@ DPDK_RTE_TARGET ?= "${ARCH}-dpaa-linuxapp-gcc" | |||
24 | 24 | ||
25 | export RTE_TARGET = "${DPDK_RTE_TARGET}" | 25 | export RTE_TARGET = "${DPDK_RTE_TARGET}" |
26 | export RTE_OUTPUT = "${S}/${RTE_TARGET}" | 26 | export RTE_OUTPUT = "${S}/${RTE_TARGET}" |
27 | export MODULE_DIR = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" | 27 | export MODULE_DIR = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net" |
28 | 28 | ||
29 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
30 | 30 | ||
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 @@ | |||
1 | From 229fc129be85a4d2d2c4efddae7bb97c3d87d416 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Mar 2023 22:02:01 -0700 | ||
4 | Subject: [PATCH] examples: fix Arm build with GCC 12 | ||
5 | |||
6 | GCC-12 warns when a pointer of type union points to an array of same | ||
7 | defined size, as union internally gets paded with pad bytes. | ||
8 | |||
9 | ../examples/common/neon/port_group.h:42:21: error: array subscript | ||
10 | 'union <anonymous>[0]' is partly outside array bounds of | ||
11 | 'uint16_t[5]' {aka 'short unsigned int[5]'} | ||
12 | [-Werror=array-bounds] | ||
13 | 42 | pnum->u64 = gptbl[v].pnum; | ||
14 | | ^~ | ||
15 | ../examples/common/neon/port_group.h:21:23: note: object 'pn' of | ||
16 | size [0, 10] | ||
17 | 21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1 | ||
18 | | ~~~~~~~~~^~~~~~~~~~~~~~~ | ||
19 | ../examples/common/neon/port_group.h:43:21: error: array subscript | ||
20 | 'union <anonymous>[0]' is partly outside array bounds of | ||
21 | 'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds] | ||
22 | 43 | pnum->u16[FWDSTEP] = 1; | ||
23 | | ^~ | ||
24 | |||
25 | Fixes: 732115ce38c6 ("examples/l3fwd: move packet group function in common") | ||
26 | |||
27 | Upstream-Status: Backport [https://github.com/DPDK/dpdk/commit/b269bd630e96b276a69d698e13ad9ebfbbb67512] | ||
28 | Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com> | ||
29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
30 | --- | ||
31 | examples/l3fwd/l3fwd_neon.h | 2 +- | ||
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
33 | |||
34 | diff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h | ||
35 | index 86ac5971d7..dc73e9fef7 100644 | ||
36 | --- a/examples/l3fwd/l3fwd_neon.h | ||
37 | +++ b/examples/l3fwd/l3fwd_neon.h | ||
38 | @@ -77,7 +77,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1, | ||
39 | union { | ||
40 | uint16_t u16[FWDSTEP + 1]; | ||
41 | uint64_t u64; | ||
42 | - } *pnum = (void *)pn; | ||
43 | + } __rte_packed *pnum = (void *)pn; | ||
44 | |||
45 | int32_t v; | ||
46 | uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0}; | ||
47 | -- | ||
48 | 2.39.2 | ||
49 | |||
diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb index e974eba0..b14d4fbf 100644 --- a/recipes-extended/dpdk/dpdk_19.11-20.12.bb +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb | |||
@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1 \ | |||
8 | file://0001-add-Wno-cast-function-type.patch \ | 8 | file://0001-add-Wno-cast-function-type.patch \ |
9 | file://0001-Add-RTE_KERNELDIR_OUT.patch \ | 9 | file://0001-Add-RTE_KERNELDIR_OUT.patch \ |
10 | file://0005-use-python3-instead-of-python.patch \ | 10 | file://0005-use-python3-instead-of-python.patch \ |
11 | file://0001-examples-fix-Arm-build-with-GCC-12.patch \ | ||
11 | " | 12 | " |
12 | SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" | 13 | SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" |
13 | 14 | ||