Re: [meta-freescale] [PATCH 12/32] dpdk: update to 3d7a6ae
On Thu, Oct 12, 2017 at 6:24 AM, Chunrong Guowrote: > From: Chunrong Guo > > *include the following changes > 3d7a6ae - license: fix legal review request comments > 148e3dc - Revert "crypto/openssl: fix compilation break with openssl 1.1" > 9845264 - crypto/openssl: fix compilation break with openssl 1.1 > 95e380c - net/dpaa2: set queues if reconfiguration is done > 64578fa - bus/dpaa: fix port order shuffling > f58c470 - Merge pull request #451 in GITAM/dpdk from feature/DPDK-837 to > 17.05-qoriq > 7132562 - dpaa: Patch to fix coverity issue > > Signed-off-by: Chunrong Guo > --- > .../dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch| 119 > - > recipes-extended/dpdk/dpdk_16.07.bb| 8 +- > 2 files changed, 2 insertions(+), 125 deletions(-) > delete mode 100644 > recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch > > diff --git a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch > b/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch > deleted file mode 100644 > index 399510a..000 > --- a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch > +++ /dev/null > @@ -1,119 +0,0 @@ > -From 03ee26cd708971a51f056e3f53482367aa38fcb1 Mon Sep 17 00:00:00 2001 > -From: Chunrong Guo > -Date: Wed, 12 Jul 2017 12:03:38 +0800 > -Subject: [PATCH] fix build with gcc 7.1 > - > -Signed-off-by: Chunrong Guo > > - lib/librte_cmdline/cmdline_parse_num.c| 4 ++-- > - lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 +- > - lib/librte_hash/rte_crc_arm64.h | 2 ++ > - lib/librte_ring/rte_ring.h| 18 -- > - mk/toolchain/gcc/rte.vars.mk | 6 ++ > - 5 files changed, 23 insertions(+), 9 deletions(-) > - > -diff --git a/lib/librte_cmdline/cmdline_parse_num.c > b/lib/librte_cmdline/cmdline_parse_num.c > -index b0f9a35..e507ec4 100644 > a/lib/librte_cmdline/cmdline_parse_num.c > -+++ b/lib/librte_cmdline/cmdline_parse_num.c > -@@ -250,7 +250,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const > char *srcbuf, void *res, > - > - case HEX: > - st = HEX_OK; > -- /* no break */ > -+ /* fall-through no break */ > - case HEX_OK: > - if (c >= '0' && c <= '9') { > - if (add_to_res(c - '0', , 16) < 0) > -@@ -282,7 +282,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const > char *srcbuf, void *res, > - > - case BIN: > - st = BIN_OK; > -- /* no break */ > -+ /* fall-through */ > - case BIN_OK: > - if (c >= '0' && c <= '1') { > - if (add_to_res(c - '0', , 2) < 0) > -diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h > b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h > -index e5554ca..8d76f32 100644 > a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h > -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h > -@@ -607,7 +607,7 @@ struct igb_adapter { > - int int_mode; > - u32 rss_queues; > - u32 vmdq_pools; > -- char fw_version[32]; > -+ char fw_version[43]; > - u32 wvbr; > - struct igb_mac_addr *mac_table; > - #ifdef CONFIG_IGB_VMDQ_NETDEV > -diff --git a/lib/librte_hash/rte_crc_arm64.h > b/lib/librte_hash/rte_crc_arm64.h > -index 7dd6334..a17c0e4 100644 > a/lib/librte_hash/rte_crc_arm64.h > -+++ b/lib/librte_hash/rte_crc_arm64.h > -@@ -110,8 +110,10 @@ rte_hash_crc_set_alg(uint8_t alg) > - case CRC32_ARM64: > - if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32)) > - alg = CRC32_SW; > -+/* fall-through */ > - case CRC32_SW: > - crc32_alg = alg; > -+/* fall-through */ > - default: > - break; > - } > -diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h > -index 0e22e69..085f3fe 100644 > a/lib/librte_ring/rte_ring.h > -+++ b/lib/librte_ring/rte_ring.h > -@@ -364,9 +364,12 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); > - r->ring[idx+3] = obj_table[i+3]; \ > - } \ > - switch (n & 0x3) { \ > -- case 3: r->ring[idx++] = obj_table[i++]; \ > -- case 2: r->ring[idx++] = obj_table[i++]; \ > -- case 1: r->ring[idx++] = obj_table[i++]; \ > -+ case 3: \ > -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ > -+ case 2: \ > -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ > -+ case 1: \ > -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ > -
[meta-freescale] [PATCH 12/32] dpdk: update to 3d7a6ae
From: Chunrong Guo*include the following changes 3d7a6ae - license: fix legal review request comments 148e3dc - Revert "crypto/openssl: fix compilation break with openssl 1.1" 9845264 - crypto/openssl: fix compilation break with openssl 1.1 95e380c - net/dpaa2: set queues if reconfiguration is done 64578fa - bus/dpaa: fix port order shuffling f58c470 - Merge pull request #451 in GITAM/dpdk from feature/DPDK-837 to 17.05-qoriq 7132562 - dpaa: Patch to fix coverity issue Signed-off-by: Chunrong Guo --- .../dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch| 119 - recipes-extended/dpdk/dpdk_16.07.bb| 8 +- 2 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch diff --git a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch b/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch deleted file mode 100644 index 399510a..000 --- a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 03ee26cd708971a51f056e3f53482367aa38fcb1 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo -Date: Wed, 12 Jul 2017 12:03:38 +0800 -Subject: [PATCH] fix build with gcc 7.1 - -Signed-off-by: Chunrong Guo - lib/librte_cmdline/cmdline_parse_num.c| 4 ++-- - lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 +- - lib/librte_hash/rte_crc_arm64.h | 2 ++ - lib/librte_ring/rte_ring.h| 18 -- - mk/toolchain/gcc/rte.vars.mk | 6 ++ - 5 files changed, 23 insertions(+), 9 deletions(-) - -diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c -index b0f9a35..e507ec4 100644 a/lib/librte_cmdline/cmdline_parse_num.c -+++ b/lib/librte_cmdline/cmdline_parse_num.c -@@ -250,7 +250,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, - - case HEX: - st = HEX_OK; -- /* no break */ -+ /* fall-through no break */ - case HEX_OK: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', , 16) < 0) -@@ -282,7 +282,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, - - case BIN: - st = BIN_OK; -- /* no break */ -+ /* fall-through */ - case BIN_OK: - if (c >= '0' && c <= '1') { - if (add_to_res(c - '0', , 2) < 0) -diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -index e5554ca..8d76f32 100644 a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -@@ -607,7 +607,7 @@ struct igb_adapter { - int int_mode; - u32 rss_queues; - u32 vmdq_pools; -- char fw_version[32]; -+ char fw_version[43]; - u32 wvbr; - struct igb_mac_addr *mac_table; - #ifdef CONFIG_IGB_VMDQ_NETDEV -diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/librte_hash/rte_crc_arm64.h -index 7dd6334..a17c0e4 100644 a/lib/librte_hash/rte_crc_arm64.h -+++ b/lib/librte_hash/rte_crc_arm64.h -@@ -110,8 +110,10 @@ rte_hash_crc_set_alg(uint8_t alg) - case CRC32_ARM64: - if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32)) - alg = CRC32_SW; -+/* fall-through */ - case CRC32_SW: - crc32_alg = alg; -+/* fall-through */ - default: - break; - } -diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h -index 0e22e69..085f3fe 100644 a/lib/librte_ring/rte_ring.h -+++ b/lib/librte_ring/rte_ring.h -@@ -364,9 +364,12 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); - r->ring[idx+3] = obj_table[i+3]; \ - } \ - switch (n & 0x3) { \ -- case 3: r->ring[idx++] = obj_table[i++]; \ -- case 2: r->ring[idx++] = obj_table[i++]; \ -- case 1: r->ring[idx++] = obj_table[i++]; \ -+ case 3: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ -+ case 2: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ -+ case 1: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++)\ -@@ -390,9 +393,12 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); - obj_table[i+3] = r->ring[idx+3]; \ - } \ - switch (n & 0x3) { \ -- case