diff options
13 files changed, 22 insertions, 371 deletions
diff --git a/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch b/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch deleted file mode 100644 index 6ee2a7ef..00000000 --- a/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Date: Wed, 21 Sep 2016 13:56:31 +0530 -Subject: [PATCH] examples: fix ip_pipeline to load PMD driver correctly - -There is typo in init.c of ip_pipeline example due to which, -invalid file path is added to -d option of EAL i.e path starting -with =. - -*Update* -There was an issue identified in http://dpdk.org/dev/patchwork/patch/16363/ -which is folded in here to stay at just one patch. - -Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> - -Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15995/ -Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Last-update: 2016-10-04 - ---- - examples/ip_pipeline/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c -index cd167f6..27b0aa7 100644 ---- a/examples/ip_pipeline/init.c -+++ b/examples/ip_pipeline/init.c -@@ -236,7 +236,7 @@ app_init_eal(struct app_params *app) - } - - if (p->add_driver) { -- snprintf(buffer, sizeof(buffer), "-d=%s", p->add_driver); -+ snprintf(buffer, sizeof(buffer), "-d%s", p->add_driver); - app->eal_argv[n_args++] = strdup(buffer); - } - --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-kni-fix-build-with-kernel-4.9.patch b/debian/patches/dpdk-dev-kni-fix-build-with-kernel-4.9.patch deleted file mode 100644 index 931965c3..00000000 --- a/debian/patches/dpdk-dev-kni-fix-build-with-kernel-4.9.patch +++ /dev/null @@ -1,89 +0,0 @@ -Description: compile error: - CC [M] .../lib/librte_eal/linuxapp/kni/igb_main.o -.../lib/librte_eal/linuxapp/kni/igb_main.c:2317:21: -error: initialization from incompatible pointer type - [-Werror=incompatible-pointer-types] - .ndo_set_vf_vlan = igb_ndo_set_vf_vlan, - ^~~~~~~~~~~~~~~~~~~ - -Linux kernel 4.9 updates API for ndo_set_vf_vlan: -Linux: 79aab093a0b5 ("net: Update API for VF vlan protocol 802.1ad support") - -Use new API for Linux kernels >= 4.9 - -Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> -Tested-by: Pablo de Lara <pablo.de.lara.guarch@intel.com> - -Origin: Upstream, http://dpdk.org/dev/patchwork/patch/16651/ -Author: Luca Boccassi <luca.boccassi@gmail.com> -Last-Update: 2016-10-17 ---- - lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 19 +++++++++++++++++++ - lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 4 ++++ - 2 files changed, 23 insertions(+) - ---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c -@@ -195,7 +195,11 @@ static void igb_process_mdd_event(struct - #ifdef IFLA_VF_MAX - static int igb_ndo_set_vf_mac( struct net_device *netdev, int vf, u8 *mac); - static int igb_ndo_set_vf_vlan(struct net_device *netdev, -+#ifdef HAVE_VF_VLAN_PROTO -+ int vf, u16 vlan, u8 qos, __be16 vlan_proto); -+#else - int vf, u16 vlan, u8 qos); -+#endif - #ifdef HAVE_VF_SPOOFCHK_CONFIGURE - static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, - bool setting); -@@ -6411,7 +6415,11 @@ static void igb_set_vmvir(struct igb_ada - } - - static int igb_ndo_set_vf_vlan(struct net_device *netdev, -+#ifdef HAVE_VF_VLAN_PROTO -+ int vf, u16 vlan, u8 qos, __be16 vlan_proto) -+#else - int vf, u16 vlan, u8 qos) -+#endif - { - int err = 0; - struct igb_adapter *adapter = netdev_priv(netdev); -@@ -6419,6 +6427,12 @@ static int igb_ndo_set_vf_vlan(struct ne - /* VLAN IDs accepted range 0-4094 */ - if ((vf >= adapter->vfs_allocated_count) || (vlan > VLAN_VID_MASK-1) || (qos > 7)) - return -EINVAL; -+ -+#ifdef HAVE_VF_VLAN_PROTO -+ if (vlan_proto != htons(ETH_P_8021Q)) -+ return -EPROTONOSUPPORT; -+#endif -+ - if (vlan || qos) { - err = igb_vlvf_set(adapter, vlan, !!vlan, vf); - if (err) -@@ -6579,7 +6593,12 @@ static inline void igb_vf_reset(struct i - if (adapter->vf_data[vf].pf_vlan) - igb_ndo_set_vf_vlan(adapter->netdev, vf, - adapter->vf_data[vf].pf_vlan, -+#ifdef HAVE_VF_VLAN_PROTO -+ adapter->vf_data[vf].pf_qos, -+ htons(ETH_P_8021Q)); -+#else - adapter->vf_data[vf].pf_qos); -+#endif - else - igb_clear_vf_vfta(adapter, vf); - #endif ---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h -@@ -3906,6 +3906,10 @@ skb_set_hash(struct sk_buff *skb, __u32 - #endif /* !RHEL 7.2 */ - #endif /* 4.0.0 */ - -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) -+#define HAVE_VF_VLAN_PROTO -+#endif /* >= 4.9.0 */ -+ - #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) ) - /* ndo_bridge_getlink adds new nlflags parameter */ - #define HAVE_NDO_BRIDGE_GETLINK_NLFLAGS diff --git a/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch index 1a261f33..8def85de 100644 --- a/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch +++ b/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch @@ -21,11 +21,9 @@ Last-Update: 2016-09-21 create mode 100644 lib/librte_eal/common/include/arch/ppc_64/rte_vect.h create mode 100644 lib/librte_lpm/rte_lpm_altivec.h -diff --git a/app/test/test_xmmt_ops.h b/app/test/test_xmmt_ops.h -index de9c16f..42174d2 100644 --- a/app/test/test_xmmt_ops.h +++ b/app/test/test_xmmt_ops.h -@@ -62,6 +62,22 @@ vect_set_epi32(int i3, int i2, int i1, int i0) +@@ -62,6 +62,22 @@ /* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ #define vect_set_epi32(i3, i2, i1, i0) _mm_set_epi32(i3, i2, i1, i0) @@ -48,11 +46,9 @@ index de9c16f..42174d2 100644 #endif #endif /* _TEST_XMMT_OPS_H_ */ -diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc -index bef8f49..9ddf3c5 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc -@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n +@@ -56,7 +56,6 @@ CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. @@ -60,9 +56,6 @@ index bef8f49..9ddf3c5 100644 CONFIG_RTE_LIBRTE_ACL=n CONFIG_RTE_LIBRTE_SCHED=n CONFIG_RTE_LIBRTE_PORT=n -diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h b/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h -new file mode 100644 -index 0000000..05209e5 --- /dev/null +++ b/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h @@ -0,0 +1,60 @@ @@ -126,11 +119,9 @@ index 0000000..05209e5 +#endif + +#endif /* _RTE_VECT_PPC_64_H_ */ -diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile -index 656ade2..3dc549d 100644 --- a/lib/librte_lpm/Makefile +++ b/lib/librte_lpm/Makefile -@@ -51,6 +51,8 @@ ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) +@@ -51,6 +51,8 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h else ifeq ($(CONFIG_RTE_ARCH_X86),y) SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h @@ -139,11 +130,9 @@ index 656ade2..3dc549d 100644 endif # this lib needs eal -diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h -index 2df1d67..dbe5483 100644 --- a/lib/librte_lpm/rte_lpm.h +++ b/lib/librte_lpm/rte_lpm.h -@@ -480,6 +480,8 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4], +@@ -480,6 +480,8 @@ #if defined(RTE_ARCH_ARM) || defined(RTE_ARCH_ARM64) #include "rte_lpm_neon.h" @@ -152,9 +141,6 @@ index 2df1d67..dbe5483 100644 #else #include "rte_lpm_sse.h" #endif -diff --git a/lib/librte_lpm/rte_lpm_altivec.h b/lib/librte_lpm/rte_lpm_altivec.h -new file mode 100644 -index 0000000..e26e087 --- /dev/null +++ b/lib/librte_lpm/rte_lpm_altivec.h @@ -0,0 +1,154 @@ @@ -312,6 +298,3 @@ index 0000000..e26e087 +#endif + +#endif /* _RTE_LPM_ALTIVEC_H_ */ --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch index fad0a71e..d8bf464b 100644 --- a/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch +++ b/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch @@ -25,11 +25,9 @@ Last-Update: 2016-09-21 create mode 100644 lib/librte_acl/acl_run_altivec.c create mode 100644 lib/librte_acl/acl_run_altivec.h -diff --git a/app/test-acl/main.c b/app/test-acl/main.c -index d366981..1b2b176 100644 --- a/app/test-acl/main.c +++ b/app/test-acl/main.c -@@ -105,6 +105,10 @@ static const struct acl_alg acl_alg[] = { +@@ -105,6 +105,10 @@ .name = "neon", .alg = RTE_ACL_CLASSIFY_NEON, }, @@ -40,11 +38,9 @@ index d366981..1b2b176 100644 }; static struct { -diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc -index 9ddf3c5..dede34f 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc -@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n +@@ -56,7 +56,6 @@ CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. @@ -52,11 +48,9 @@ index 9ddf3c5..dede34f 100644 CONFIG_RTE_LIBRTE_SCHED=n CONFIG_RTE_LIBRTE_PORT=n CONFIG_RTE_LIBRTE_TABLE=n -diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile -index 9803e9d..d05be66 100644 --- a/lib/librte_acl/Makefile +++ b/lib/librte_acl/Makefile -@@ -52,6 +52,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c +@@ -52,6 +52,8 @@ ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c CFLAGS_acl_run_neon.o += -flax-vector-conversions -Wno-maybe-uninitialized @@ -65,11 +59,9 @@ index 9803e9d..d05be66 100644 else SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c #check if flag for SSE4.1 is already on, if not set it up manually -diff --git a/lib/librte_acl/acl.h b/lib/librte_acl/acl.h -index 09d6784..6664a55 100644 --- a/lib/librte_acl/acl.h +++ b/lib/librte_acl/acl.h -@@ -234,6 +234,10 @@ int +@@ -234,6 +234,10 @@ rte_acl_classify_neon(const struct rte_acl_ctx *ctx, const uint8_t **data, uint32_t *results, uint32_t num, uint32_t categories); @@ -80,8 +72,6 @@ index 09d6784..6664a55 100644 #ifdef __cplusplus } #endif /* __cplusplus */ -diff --git a/lib/librte_acl/acl_run.h b/lib/librte_acl/acl_run.h -index b2fc42c..024f393 100644 --- a/lib/librte_acl/acl_run.h +++ b/lib/librte_acl/acl_run.h @@ -39,7 +39,9 @@ @@ -94,9 +84,6 @@ index b2fc42c..024f393 100644 #define MAX_SEARCHES_SCALAR 2 #define GET_NEXT_4BYTES(prm, idx) \ -diff --git a/lib/librte_acl/acl_run_altivec.c b/lib/librte_acl/acl_run_altivec.c -new file mode 100644 -index 0000000..3523526 --- /dev/null +++ b/lib/librte_acl/acl_run_altivec.c @@ -0,0 +1,47 @@ @@ -147,9 +134,6 @@ index 0000000..3523526 + return rte_acl_classify_scalar(ctx, data, results, num, + categories); +} -diff --git a/lib/librte_acl/acl_run_altivec.h b/lib/librte_acl/acl_run_altivec.h -new file mode 100644 -index 0000000..7d329bc --- /dev/null +++ b/lib/librte_acl/acl_run_altivec.h @@ -0,0 +1,329 @@ @@ -482,11 +466,9 @@ index 0000000..7d329bc + + return 0; +} -diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c -index 4ba9786..8b7e92c 100644 --- a/lib/librte_acl/rte_acl.c +++ b/lib/librte_acl/rte_acl.c -@@ -75,12 +75,23 @@ rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx, +@@ -75,12 +75,23 @@ return -ENOTSUP; } @@ -510,7 +492,7 @@ index 4ba9786..8b7e92c 100644 }; /* by default, use always available scalar code path. */ -@@ -119,6 +130,8 @@ rte_acl_init(void) +@@ -119,6 +130,8 @@ #elif defined(RTE_ARCH_ARM) if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) alg = RTE_ACL_CLASSIFY_NEON; @@ -519,11 +501,9 @@ index 4ba9786..8b7e92c 100644 #else #ifdef CC_AVX2_SUPPORT if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) -diff --git a/lib/librte_acl/rte_acl.h b/lib/librte_acl/rte_acl.h -index 0979a09..8d4e2a6 100644 --- a/lib/librte_acl/rte_acl.h +++ b/lib/librte_acl/rte_acl.h -@@ -271,6 +271,7 @@ enum rte_acl_classify_alg { +@@ -271,6 +271,7 @@ RTE_ACL_CLASSIFY_SSE = 2, /**< requires SSE4.1 support. */ RTE_ACL_CLASSIFY_AVX2 = 3, /**< requires AVX2 support. */ RTE_ACL_CLASSIFY_NEON = 4, /**< requires NEON support. */ @@ -531,6 +511,3 @@ index 0979a09..8d4e2a6 100644 RTE_ACL_CLASSIFY_NUM /* should always be the last one. */ }; --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch b/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch index f1349fbf..a28bb14d 100644 --- a/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch +++ b/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch @@ -15,11 +15,9 @@ Last-Update: 2016-09-21 config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - 1 file changed, 1 deletion(-) -diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc -index dede34f..45b6077 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc -@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n +@@ -56,7 +56,6 @@ CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. @@ -27,6 +25,3 @@ index dede34f..45b6077 100644 CONFIG_RTE_LIBRTE_PORT=n CONFIG_RTE_LIBRTE_TABLE=n CONFIG_RTE_LIBRTE_PIPELINE=n --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch b/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch index a4bb1940..736481d6 100644 --- a/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch +++ b/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch @@ -16,11 +16,9 @@ Last-Update: 2016-09-21 config/defconfig_ppc_64-power8-linuxapp-gcc | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc -index 45b6077..f953e61 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc -@@ -56,7 +56,3 @@ CONFIG_RTE_LIBRTE_PMD_BOND=n +@@ -55,7 +55,3 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n @@ -28,6 +26,3 @@ index 45b6077..f953e61 100644 -CONFIG_RTE_LIBRTE_PORT=n -CONFIG_RTE_LIBRTE_TABLE=n -CONFIG_RTE_LIBRTE_PIPELINE=n --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch deleted file mode 100644 index e98d33f1..00000000 --- a/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Date: Thu, 8 Sep 2016 22:18:10 +0530 -Subject: [PATCH 7/7] examples/ip_pipeline: fix lcore mapping for ppc64 - -This patch fixes ip_pipeline panic in app_init_core_map while preparing cpu -core map in powerpc with SMT off. cpu_core_map_compute_linux currently prepares -core mapping based on file existence in sysfs ie. - -/sys/devices/system/cpu/cpu<LCORE_NUM>/topology/physical_package_id - /sys/devices/system/cpu/cpu<LCORE_NUM>/topology/core_id - -These files do not exist for lcores which are offline for any reason (as in -powerpc, while SMT is off). In this situation, this function should further -continue preparing map for other online lcores instead of returning with -1 -for a first unavailable lcore. - -Also, in SMT=off scenario for powerpc, lcore ids can not be always indexed from -0 upto 'number of cores present' (/sys/devices/system/cpu/present). For eg, for -an online lcore 32, core_id returned in sysfs is 112 where online lcores are -10 (as in one configuration), hence sysfs lcore id can not be checked with -indexing lcore number before positioning lcore map array. - -Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> -Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> - -Origin: Upstream, commit:58d55fd279dc6f8f8d92fcab3362e24e19c9fbea -Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> -Last-Update: 2016-09-21 ---- - examples/ip_pipeline/cpu_core_map.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/examples/ip_pipeline/cpu_core_map.c b/examples/ip_pipeline/cpu_core_map.c -index cb088b1..dd8f678 100644 ---- a/examples/ip_pipeline/cpu_core_map.c -+++ b/examples/ip_pipeline/cpu_core_map.c -@@ -351,8 +351,10 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) - int lcore_socket_id = - cpu_core_map_get_socket_id_linux(lcore_id); - -+#if !defined(RTE_ARCH_PPC_64) - if (lcore_socket_id < 0) - return -1; -+#endif - - if (((uint32_t) lcore_socket_id) == socket_id) - n_detected++; -@@ -368,6 +370,7 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) - cpu_core_map_get_socket_id_linux( - lcore_id); - -+#if !defined(RTE_ARCH_PPC_64) - if (lcore_socket_id < 0) - return -1; - -@@ -377,9 +380,14 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) - - if (lcore_core_id < 0) - return -1; -+#endif - -+#if !defined(RTE_ARCH_PPC_64) - if (((uint32_t) lcore_socket_id == socket_id) && - ((uint32_t) lcore_core_id == core_id)) { -+#else -+ if (((uint32_t) lcore_socket_id == socket_id)) { -+#endif - uint32_t pos = cpu_core_map_pos(map, - socket_id, - core_id_contig, --- -1.9.1 - diff --git a/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch b/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch index f2e307f1..5ff0dd25 100644 --- a/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch +++ b/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch @@ -1,8 +1,6 @@ -diff --git a/doc/guides/conf.py b/doc/guides/conf.py -index cd6a4f7..55b6b2f 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py -@@ -105,6 +105,14 @@ class CustomLatexFormatter(LatexFormatter): +@@ -92,6 +92,14 @@ # Replace the default latex formatter. PygmentsBridge.latex_formatter = CustomLatexFormatter @@ -17,11 +15,9 @@ index cd6a4f7..55b6b2f 100644 ######## :numref: fallback ######## # The following hook functions add some simple handling for the :numref: # directive for Sphinx versions prior to 1.3.1. The functions replace the -diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk -index 9952f25..21d9bdf 100644 --- a/mk/rte.sdkdoc.mk +++ b/mk/rte.sdkdoc.mk -@@ -63,7 +63,7 @@ help: +@@ -63,7 +63,7 @@ all: api-html guides-html guides-pdf .PHONY: clean @@ -30,11 +26,9 @@ index 9952f25..21d9bdf 100644 .PHONY: api-html api-html: api-html-clean -diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk -index 5217063..533d369 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk -@@ -66,6 +66,7 @@ includedir ?= $(prefix)/include/dpdk +@@ -66,6 +66,7 @@ datarootdir ?= $(prefix)/share docdir ?= $(datarootdir)/doc/dpdk datadir ?= $(datarootdir)/dpdk @@ -42,7 +36,7 @@ index 5217063..533d369 100644 sdkdir ?= $(datadir) targetdir ?= $(datadir)/$(RTE_TARGET) -@@ -133,6 +134,11 @@ install-runtime: +@@ -133,6 +134,11 @@ $(DESTDIR)$(sbindir)/dpdk-devbind) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-pmdinfo.py, \ $(DESTDIR)$(bindir)/dpdk-pmdinfo) diff --git a/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch b/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch index ab0f9b4a..7fe7a1ba 100644 --- a/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch +++ b/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch @@ -1,8 +1,6 @@ -diff --git a/doc/guides/conf.py b/doc/guides/conf.py -index 55b6b2f..c45c4be 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py -@@ -111,7 +111,9 @@ man_pages = [("testpmd_app_ug/run_app", "testpmd", +@@ -98,7 +98,9 @@ ("tools/pdump", "dpdk-pdump", "enable packet capture on dpdk ports", "", 1), ("tools/proc_info", "dpdk-procinfo", @@ -13,19 +11,14 @@ index 55b6b2f..c45c4be 100644 ######## :numref: fallback ######## # The following hook functions add some simple handling for the :numref: -diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst -index d7654a2..80f2115 100644 --- a/doc/guides/tools/index.rst +++ b/doc/guides/tools/index.rst -@@ -37,4 +37,5 @@ Tool User Guides +@@ -37,4 +37,5 @@ proc_info pdump + pmdinfo -diff --git a/doc/guides/tools/pmdinfo.rst b/doc/guides/tools/pmdinfo.rst -new file mode 100644 -index 0000000..a90c59f --- /dev/null +++ b/doc/guides/tools/pmdinfo.rst @@ -0,0 +1,57 @@ diff --git a/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch b/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch index 4b6c18da..86baa43b 100644 --- a/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch +++ b/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch @@ -1,8 +1,6 @@ -diff --git a/doc/guides/conf.py b/doc/guides/conf.py -index c45c4be..149bcdb 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py -@@ -113,7 +113,9 @@ man_pages = [("testpmd_app_ug/run_app", "testpmd", +@@ -100,7 +100,9 @@ ("tools/proc_info", "dpdk-procinfo", "access dpdk port stats and memory info", "", 1), ("tools/pmdinfo", "dpdk-pmdinfo", @@ -13,9 +11,6 @@ index c45c4be..149bcdb 100644 ######## :numref: fallback ######## # The following hook functions add some simple handling for the :numref: -diff --git a/doc/guides/tools/devbind.rst b/doc/guides/tools/devbind.rst -new file mode 100644 -index 0000000..18a8059 --- /dev/null +++ b/doc/guides/tools/devbind.rst @@ -0,0 +1,143 @@ @@ -162,21 +157,17 @@ index 0000000..18a8059 + Network devices using DPDK-compatible driver + ============================================ + 0000:0a:00.0 '82599ES 10-Gigabit' drv=igb_uio unused= -diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst -index 80f2115..cbe98b2 100644 --- a/doc/guides/tools/index.rst +++ b/doc/guides/tools/index.rst -@@ -38,4 +38,5 @@ Tool User Guides +@@ -38,4 +38,5 @@ proc_info pdump pmdinfo + devbind -diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk -index 533d369..b1faf28 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk -@@ -139,6 +139,11 @@ ifneq ($(wildcard $O/doc/man/*/*.1),) +@@ -139,6 +139,11 @@ $(Q)$(call rte_mkdir, $(DESTDIR)$(mandir)/man1) $(Q)cp -a $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1 endif diff --git a/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch b/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch deleted file mode 100644 index 92751472..00000000 --- a/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE - -Linux: 7e9321599011 ("treewide: remove references to the now unnecessary -DEFINE_PCI_DEVICE_TABLE") - -Replaced macro with its value in kni ethtool drivers. - -Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> - -Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15717/ -Author: Christian Ehrhardt <christian.ehrhardt@canonical.com> -Last-Update: 2016-09-19 - ---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c -@@ -76,7 +76,7 @@ - static const char igb_copyright[] = - "Copyright (c) 2007-2013 Intel Corporation."; - --static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { -+const struct pci_device_id igb_pci_tbl[] = { - { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) }, - { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) }, ---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c -+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c -@@ -86,7 +86,7 @@ - * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, - * Class, Class Mask, private data (not used) } - */ --DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { -+const struct pci_device_id ixgbe_pci_tbl[] = { - {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598)}, - {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)}, - {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT)}, diff --git a/debian/patches/fix-unusual-interpreter.patch b/debian/patches/fix-unusual-interpreter.patch deleted file mode 100644 index 754a4135..00000000 --- a/debian/patches/fix-unusual-interpreter.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: examples: fix unusual-interpreter v2 - -*Update in v2* -- use #!/usr/bin/env python as usually recommended and suggested in the - discussion - -Due to regular lintian checks in Debian packaging it surfaced that these -two scripts had a space in their #! statement which renders it to be -human, but not shell readable. - -Fixes: 8673a3e8 ("examples/ip_pipeline: add config diagram generator") -Fixes: fa667b46 ("examples/ip_pipeline: add core mappings script") - -This gets rid of lintian warning "W: dpdk-doc: unusual-interpreter" - -Forwarded: yes -Author: Christian Ehrhardt <christian.ehrhardt@canonical.com> -Last-Update: 2016-08-02 - ---- a/examples/ip_pipeline/config/diagram-generator.py -+++ b/examples/ip_pipeline/config/diagram-generator.py -@@ -1,4 +1,4 @@ --#! /usr/bin/python2 -+#!/usr/bin/env python - - # BSD LICENSE - # ---- a/examples/ip_pipeline/config/pipeline-to-core-mapping.py -+++ b/examples/ip_pipeline/config/pipeline-to-core-mapping.py -@@ -1,4 +1,4 @@ --#! /usr/bin/python2 -+#!/usr/bin/env python - - # BSD LICENSE - # diff --git a/debian/patches/series b/debian/patches/series index 0d8fd299..e9256b40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ fix-vhost-user-socket-permission.patch fix-double-license-info.patch -fix-unusual-interpreter.patch dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch make-load-devel-config-not-to-appear-as-executable.patch rte-compile-pre-cppflags.patch @@ -10,14 +9,10 @@ dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch -dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch dpdk-dev-ppc-enable-3-7-examples-l3fwd-add-AltiVec-for-ppc64.patch dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch dpdk-dev-ppc-enable-5-7-table-fix-verification-on-hash-bucket-header-alignme.patch dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch -dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch -dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch -dpdk-dev-kni-fix-build-with-kernel-4.9.patch |