[dpdk-stable] patch 'net/i40e: support aarch32' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/09/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From bb582fa76942db216d7714bc7e9553927072b06a Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Wed, 24 Jun 2020 15:10:15 +0800
Subject: [PATCH] net/i40e: support aarch32

[ upstream commit 78bfe1666b2063e3fc3fa51e757159f53e1fc779 ]

Expand vector PMD support to aarch32.
Enable i40e PMD by default for armv7 make build.

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 config/defconfig_arm-armv7a-linuxapp-gcc | 1 -
 drivers/net/i40e/Makefile                | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc
index c91423f0e..749f9924d 100644
--- a/config/defconfig_arm-armv7a-linuxapp-gcc
+++ b/config/defconfig_arm-armv7a-linuxapp-gcc
@@ -45,7 +45,6 @@ CONFIG_RTE_LIBRTE_CXGBE_PMD=n
 CONFIG_RTE_LIBRTE_E1000_PMD=n
 CONFIG_RTE_LIBRTE_ENIC_PMD=n
 CONFIG_RTE_LIBRTE_FM10K_PMD=n
-CONFIG_RTE_LIBRTE_I40E_PMD=n
 CONFIG_RTE_LIBRTE_IXGBE_PMD=n
 CONFIG_RTE_LIBRTE_MLX4_PMD=n
 CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile
index 435eb511a..4ea58bd9e 100644
--- a/drivers/net/i40e/Makefile
+++ b/drivers/net/i40e/Makefile
@@ -72,7 +72,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c
 
 SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c
-ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
+ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
 SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c
 else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
 SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 4376d8911..56fc355ee 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -6,6 +6,7 @@
 #include <stdint.h>
 #include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
+#include <rte_vect.h>
 
 #include "base/i40e_prototype.h"
 #include "base/i40e_type.h"
@@ -13,7 +14,6 @@
 #include "i40e_rxtx.h"
 #include "i40e_rxtx_vec_common.h"
 
-#include <arm_neon.h>
 
 #pragma GCC diagnostic ignored "-Wcast-qual"
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-07 19:15:05.686623742 +0100
+++ 0001-net-i40e-support-aarch32.patch	2020-08-07 19:15:05.654257188 +0100
@@ -1,8 +1,10 @@
-From 78bfe1666b2063e3fc3fa51e757159f53e1fc779 Mon Sep 17 00:00:00 2001
+From bb582fa76942db216d7714bc7e9553927072b06a Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Wed, 24 Jun 2020 15:10:15 +0800
 Subject: [PATCH] net/i40e: support aarch32
 
+[ upstream commit 78bfe1666b2063e3fc3fa51e757159f53e1fc779 ]
+
 Expand vector PMD support to aarch32.
 Enable i40e PMD by default for armv7 make build.
 
@@ -15,22 +17,22 @@
  3 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc
-index e5d6b6a0c..ac9112086 100644
+index c91423f0e..749f9924d 100644
 --- a/config/defconfig_arm-armv7a-linuxapp-gcc
 +++ b/config/defconfig_arm-armv7a-linuxapp-gcc
-@@ -38,7 +38,6 @@ CONFIG_RTE_LIBRTE_CXGBE_PMD=n
+@@ -45,7 +45,6 @@ CONFIG_RTE_LIBRTE_CXGBE_PMD=n
  CONFIG_RTE_LIBRTE_E1000_PMD=n
  CONFIG_RTE_LIBRTE_ENIC_PMD=n
  CONFIG_RTE_LIBRTE_FM10K_PMD=n
 -CONFIG_RTE_LIBRTE_I40E_PMD=n
+ CONFIG_RTE_LIBRTE_IXGBE_PMD=n
+ CONFIG_RTE_LIBRTE_MLX4_PMD=n
  CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
- CONFIG_RTE_LIBRTE_QEDE_PMD=n
- CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
 diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile
-index 7ec8d9533..43f10941b 100644
+index 435eb511a..4ea58bd9e 100644
 --- a/drivers/net/i40e/Makefile
 +++ b/drivers/net/i40e/Makefile
-@@ -69,7 +69,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c
+@@ -72,7 +72,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c
  
  SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c
  SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c
@@ -40,7 +42,7 @@
  else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
  SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c
 diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
-index 1dfd0478b..67158f108 100644
+index 4376d8911..56fc355ee 100644
 --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
 +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
 @@ -6,6 +6,7 @@