[dpdk-stable] patch 'net/sfc: fix aarch32 build' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/21. 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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0

Thanks.

Luca Boccassi

---
>From 4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Wed, 7 Jul 2021 15:25:37 +0200
Subject: [PATCH] net/sfc: fix aarch32 build

[ upstream commit a5f1b1e5153a4b061c538f74f1cebc01c91cff1a ]

The sfc PMD was enabled for aarch32 which is 32-bit mode but has
cpu_family set to aarch64.
As sfc support only 64-bit system, it should be disabled for aarch32.

Updated meson file to disable sfc for aarch32 build.

Fixes: 141d2870675a ("net/sfc: support aarch64 architecture")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
---
 drivers/common/sfc_efx/meson.build | 2 +-
 drivers/net/sfc/meson.build        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 6cb9f0737f..1e17f1fd29 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -5,7 +5,7 @@
 # This software was jointly developed between OKTET Labs (under contract
 # for Solarflare) and Solarflare Communications, Inc.
 
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not dpdk_conf.get('RTE_ARCH_64'))
 	build = false
 	reason = 'only supported on x86_64 and aarch64'
 endif
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index be888bd87a..61535f8673 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -6,7 +6,7 @@
 # This software was jointly developed between OKTET Labs (under contract
 # for Solarflare) and Solarflare Communications, Inc.
 
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not dpdk_conf.get('RTE_ARCH_64'))
 	build = false
 	reason = 'only supported on x86_64 and aarch64'
 endif
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:42.412539514 +0100
+++ 0112-net-sfc-fix-aarch32-build.patch	2021-07-12 13:41:36.926131693 +0100
@@ -1 +1 @@
-From a5f1b1e5153a4b061c538f74f1cebc01c91cff1a Mon Sep 17 00:00:00 2001
+From 4fccdefbd82bbf9bf5f8952190347d7ba6ec97b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5f1b1e5153a4b061c538f74f1cebc01c91cff1a ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index f42ccf609c..0cf0a23bf8 100644
+index 6cb9f0737f..1e17f1fd29 100644
@@ -25,3 +26,3 @@
-@@ -10,7 +10,7 @@ if is_windows
-     reason = 'not supported on Windows'
- endif
+@@ -5,7 +5,7 @@
+ # This software was jointly developed between OKTET Labs (under contract
+ # for Solarflare) and Solarflare Communications, Inc.
@@ -31,2 +32,2 @@
-     build = false
-     reason = 'only supported on x86_64 and aarch64'
+ 	build = false
+ 	reason = 'only supported on x86_64 and aarch64'
@@ -35 +36 @@
-index ccf5984d87..18e7edb568 100644
+index be888bd87a..61535f8673 100644
@@ -38,3 +39,3 @@
-@@ -12,7 +12,7 @@ if is_windows
-     subdir_done()
- endif
+@@ -6,7 +6,7 @@
+ # This software was jointly developed between OKTET Labs (under contract
+ # for Solarflare) and Solarflare Communications, Inc.
@@ -44,2 +45,2 @@
-     build = false
-     reason = 'only supported on x86_64 and aarch64'
+ 	build = false
+ 	reason = 'only supported on x86_64 and aarch64'