From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 49022A055A
for <public@inbox.dpdk.org>; Thu, 27 Feb 2020 10:35:08 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3F5911C01;
Thu, 27 Feb 2020 10:35:08 +0100 (CET)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 001501BFEF
for <stable@dpdk.org>; Thu, 27 Feb 2020 10:35:06 +0100 (CET)
Received: by mail-wr1-f66.google.com with SMTP id j16so870046wrt.3
for <stable@dpdk.org>; Thu, 27 Feb 2020 01:35:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=k+H5HSEvNWY5fGr3m/gp7DEzQPGIm1uQRb0FzoWqFL4=;
b=OGDl8mHWlo8cx6VI5d/bNfD0NkFbHb6/hPEwmG7ZnCMn/gSBKrJdSb1AGLfbAxjXe/
Mz80j+vTaiwFqdSFoNFJZ3937sbcs6V5Vdl7ZpfVHbHRqUpSUXuanhzyno3eV5nsUGpX
KTklyyNOdqZVpuss8WFbjfy7s2iQZQOMJL4DcJ9r+XPkPJCciDhh7FRJuCwCmYZf46Vr
34dN4A2dxfHzlThNo6vxw+Pvgevs3NveDrN/Y6j9fx7dQ1rUEagPvNsLQ6itdTAdo0my
3ipuzh7TzcC7g+ZUNtSaTKnx2Iyk/18DbSvktB2lIrOoyMhsGek7nTX0PQTdgNLAWkTu
o9bw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=k+H5HSEvNWY5fGr3m/gp7DEzQPGIm1uQRb0FzoWqFL4=;
b=kT1RZgQWp+S62CnCL6+Mt3ff9Tyknu1/d/xMkvFvHnnP9LgbhNAvNTv3NqGSGy2syi
jRfrdK5S/n8sqlNkwrQgShTHgkp89NToTYNKJGvBCIaoLllRWHfPg8y6Pj99HnRYfkHH
EQecJbLJm4wl9tly6CA0J1v24ndUyHTyfvZKTSvNauy8oZSj3JsETKYcdHCoK8ya2MAX
6t3P0HSxCAhVBnhNIK1Mj0yHIfUovVL5CmjgDFWajZGrqZUMVf9ajpr0Nq/UmVAuo1pg
pO6URFfGtQlSq/5ABdmnC82NenhlaxKo3ZCa9XR/FKA5zaztScI7pFuXRdkTz/ydIv68
ql5Q==
X-Gm-Message-State: APjAAAWq6mn4oRz9fHFcJim5uRaNeP2N0Q3OBC7Hr+xKOXuywWjUOcUj
I5WjKedG3PthIE6RBums1Nc=
X-Google-Smtp-Source: APXvYqyQt5lsMP8ruqWhQqnGuiH7A6LpkqMBGdw3nl/IzBgjwjtS4UqxnTom94LLeRVbmFYd7Wh7tQ==
X-Received: by 2002:a5d:6986:: with SMTP id g6mr3791263wru.421.1582796106661;
Thu, 27 Feb 2020 01:35:06 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id i204sm7200466wma.44.2020.02.27.01.35.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 27 Feb 2020 01:35:06 -0800 (PST)
From: luca.boccassi@gmail.com
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Xiao Wang <xiao.w.wang@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Thu, 27 Feb 2020 09:33:41 +0000
Message-Id: <20200227093402.17690-21-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com>
References: <20200217174546.25334-54-luca.boccassi@gmail.com>
<20200227093402.17690-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/fm10k: fix non-x86 build' has been queued
to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/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 6f40b87129e48df2e7bb8e498515182eb18511c1 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Wed, 19 Feb 2020 14:16:42 +0000
Subject: [PATCH] net/fm10k: fix non-x86 build
[ upstream commit b565280d45022292e566cf98f8ccf926d8048d2c ]
'fm10k_rxtx_vec.c' is SSE vector instructions implementation and should
be compiled only for x86.
The vector PMD support controlled by
'CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR' config option, but it is enabled by
default, safer to add x86 checks too.
Fixes: 10eb9ce8dccd ("fm10k: allow to disable vector driver")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Xiao Wang <xiao.w.wang@intel.com>
---
drivers/net/fm10k/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile
index 722bf1ee04..338de40f23 100644
--- a/drivers/net/fm10k/Makefile
+++ b/drivers/net/fm10k/Makefile
@@ -73,6 +73,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c
+ifeq ($(CONFIG_RTE_ARCH_X86), y)
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c
+endif
include $(RTE_SDK)/mk/rte.lib.mk
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-27 09:31:56.517432540 +0000
+++ 0021-net-fm10k-fix-non-x86-build.patch 2020-02-27 09:31:55.743945932 +0000
@@ -1,8 +1,10 @@
-From b565280d45022292e566cf98f8ccf926d8048d2c Mon Sep 17 00:00:00 2001
+From 6f40b87129e48df2e7bb8e498515182eb18511c1 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Wed, 19 Feb 2020 14:16:42 +0000
Subject: [PATCH] net/fm10k: fix non-x86 build
+[ upstream commit b565280d45022292e566cf98f8ccf926d8048d2c ]
+
'fm10k_rxtx_vec.c' is SSE vector instructions implementation and should
be compiled only for x86.
@@ -11,7 +13,6 @@
default, safer to add x86 checks too.
Fixes: 10eb9ce8dccd ("fm10k: allow to disable vector driver")
-Cc: stable@dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Xiao Wang <xiao.w.wang@intel.com>
@@ -20,10 +21,10 @@
1 file changed, 2 insertions(+)
diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile
-index 0271bcb15e..29e659da8a 100644
+index 722bf1ee04..338de40f23 100644
--- a/drivers/net/fm10k/Makefile
+++ b/drivers/net/fm10k/Makefile
-@@ -71,6 +71,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c
+@@ -73,6 +73,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c
SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c