From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0E9E0A0561 for ; Thu, 27 Feb 2020 18:39:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0508B2C02; Thu, 27 Feb 2020 18:39:19 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 3D00C1BFA9 for ; Thu, 27 Feb 2020 18:39:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582825156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0fPvr+hUH3vy8Y5m3i59pFJjudVonIf9YcqqUCQL1Eg=; b=Luf9gJ7J+dnIK73+HK39d3N93fo2yog6lywMvJEHRq2d7MsNA87Fip1oGLeRPY1Zei8CGd 1MRDs7EkO2spxzCr3W+VZ1tnhS4cIkP/skoDQ/VXNEgkY9Q+oqW5wuPXgT46nja0j8ASAe gZURTxz7py+0k+KCc/8Pi7UYpAFlTa0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-koqQxJzDOku0cwEGU8P3Ew-1; Thu, 27 Feb 2020 12:39:12 -0500 X-MC-Unique: koqQxJzDOku0cwEGU8P3Ew-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9DFA800D48; Thu, 27 Feb 2020 17:39:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2A868C07F; Thu, 27 Feb 2020 17:39:10 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Xiao Wang , dpdk stable Date: Thu, 27 Feb 2020 17:38:03 +0000 Message-Id: <20200227173807.28004-12-ktraynor@redhat.com> In-Reply-To: <20200227173807.28004-1-ktraynor@redhat.com> References: <20200227173807.28004-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/fm10k: fix non-x86 build' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/1ad69246955323beb5= f0a7e8ab84e72cf4a552c6 Thanks. Kevin. --- >From 1ad69246955323beb5f0a7e8ab84e72cf4a552c6 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit 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 Acked-by: Xiao Wang --- drivers/net/fm10k/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile index d657dff8a1..24f3c0b453 100644 --- a/drivers/net/fm10k/Makefile +++ b/drivers/net/fm10k/Makefile @@ -75,5 +75,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k_mbx.c SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k_vf.c SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k_api.c +ifeq ($(CONFIG_RTE_ARCH_X86), y) SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) +=3D fm10k_rxtx_vec.c +endif =20 include $(RTE_SDK)/mk/rte.lib.mk --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-27 17:26:24.400935277 +0000 +++ 0012-net-fm10k-fix-non-x86-build.patch=092020-02-27 17:26:23.659830911 = +0000 @@ -1 +1 @@ -From b565280d45022292e566cf98f8ccf926d8048d2c Mon Sep 17 00:00:00 2001 +From 1ad69246955323beb5f0a7e8ab84e72cf4a552c6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b565280d45022292e566cf98f8ccf926d8048d2c ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 0271bcb15e..29e659da8a 100644 +index d657dff8a1..24f3c0b453 100644 @@ -26 +27 @@ -@@ -72,5 +72,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k_mbx.c +@@ -75,5 +75,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k_mbx.c