net/fm10k: fix non-x86 build

Message ID 20200219141642.802413-1-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series net/fm10k: fix non-x86 build |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation fail apply issues
ci/travis-robot warning Travis build: errored

Commit Message

Ferruh Yigit Feb. 19, 2020, 2:16 p.m. UTC
  '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")
Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
Cc: jing.d.chen@intel.com
---
 drivers/net/fm10k/Makefile | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Xiao Wang Feb. 19, 2020, 2:31 p.m. UTC | #1
Acked-by: Xiao Wang <xiao.w.wang@intel.com>

Thanks,
Xiao

> -----Original Message-----
> From: Yigit, Ferruh <ferruh.yigit@intel.com>
> Sent: Wednesday, February 19, 2020 10:17 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>; Chen Jing D(Mark) <jing.d.chen@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/fm10k: fix non-x86 build
> 
> '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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> ---
> Cc: jing.d.chen@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 0271bcb15..29e659da8 100644
> --- a/drivers/net/fm10k/Makefile
> +++ b/drivers/net/fm10k/Makefile
> @@ -71,6 +71,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.24.1
  
Ferruh Yigit Feb. 19, 2020, 5:33 p.m. UTC | #2
On 2/19/2020 2:31 PM, Wang, Xiao W wrote:

> 
>> -----Original Message-----
>> From: Yigit, Ferruh <ferruh.yigit@intel.com>
>> Sent: Wednesday, February 19, 2020 10:17 PM
>> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
>> <xiao.w.wang@intel.com>; Chen Jing D(Mark) <jing.d.chen@intel.com>
>> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; stable@dpdk.org
>> Subject: [PATCH] net/fm10k: fix non-x86 build
>>
>> '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")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>
> Acked-by: Xiao Wang <xiao.w.wang@intel.com>
> 

Applied to dpdk-next-net/master, thanks.
  

Patch

diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile
index 0271bcb15..29e659da8 100644
--- a/drivers/net/fm10k/Makefile
+++ b/drivers/net/fm10k/Makefile
@@ -71,6 +71,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