From patchwork Wed May 4 12:32:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9013511 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 488BDBF29F for ; Wed, 4 May 2016 12:33:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A205203A5 for ; Wed, 4 May 2016 12:33:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B8D820390 for ; Wed, 4 May 2016 12:33:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbcEDMcx (ORCPT ); Wed, 4 May 2016 08:32:53 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59553 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbcEDMcw (ORCPT ); Wed, 4 May 2016 08:32:52 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MFfhh-1auLTM1g2P-00Ebom; Wed, 04 May 2016 14:32:37 +0200 From: Arnd Bergmann To: Matan Barak , Leon Romanovsky , Saeed Mahameed Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, davem@davemloft.net, Matthew Finlay , Richard Cochran , Amir Vadai , Haggai Abramonvsky , Maor Gottlieb , Or Gerlitz , Majd Dibbiny Subject: [PATCH 3/3] net/mlx5e: don't build RFS without ethernet Date: Wed, 4 May 2016 14:32:24 +0200 Message-Id: <1462365155-3861405-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1462364774-3792510-1-git-send-email-arnd@arndb.de> References: <1462364774-3792510-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Q9YP7nZOBQc9kWyV5GewCI/ji0lEsvSW/1qtRdh/yxejrsSHZT0 TNHbIkhkigQuP7MY2wDH1I8U4au8oc+lhcOiakXkpOEZgSuf4Qj6XvmxevPPw9BtxonQrha UixTTvJauhhss6OtCbvda4yaY/Pso4zCHVjVZwF0+IB8t/qvZ0G8pAaaMm2wd0utYSKzhDn 5Hpw8iv94xeZJFcdlMQ9w== X-UI-Out-Filterresults: notjunk:1; V01:K0:VnUe18vWVdU=:Qae85uzmutzBgCozX7Ppg8 qDaI59MtX2u9sX/mQzNJtU8dMMHU9vpxSyaXlpyMYNswIVpn/2GSX7CfsMQtmbtFxTaysmucY TQFw3Qwm/5SOFyKfQjqVL/y4mSUxmI6OHTz/9GUhCk2uh+Mr4YhNGcg+0ZJ1RU6j5H2odlLoF ir9jMeF+kojxlxV/oWAR1zkBWQGfACAOHEV3Lei24Qf2Wu6IgZ466Z09i51OfCOyiJi/E0DSr s5YvB0WDHlfiDETIT27UmJ04a+0lOhLWq3xgZfHtHsJqck3WRcMvKNB1eyptSez2aksBUi2VW 6+kwUfT7lMMx82ZGY/YZ/R+rA7vKWLDzBRBXMM3VnrdO89NBD96Ux8zmvnjgoRyTNtVrDlq7X DNPQhTH9ijV9y8kHBQLv1NDFtw/iPwKk/ooVyN9FeICsyq36+N8yvzkL6Kk/VaJTM1IXlIHBk RwS82fHTLvMG+5ZvCFv7ITM8Dp5Tr2Msyks++k0Zob0oZF0LFBHTE7P4VzEqgYjGDHaPt50fe zAdCvMItxzVnMXXOJdv1CXZ+utZtVnOtrPDvPwf1YgFHA6qoXwWxPXWYIfeNiwKt5k3/QUFmm mzUI4ItmpsOpEECX/C5sFHND91oyBc+5WZttsjyqT2RMdK3vwGaAC8fqIDQet4ZCS3EnqJj9Y prtWm/sqwMOo5bVSA7jxXWTWw1IvGprYCloYSFned/6bgGeBBKyaOp17J7zBwE8qFQf4= Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The RFS acceleration support in mlx5 is enabled whenever CONFIG_RFS_ACCEL is in use. However, this fails if a user turns off CONFIG_MLX5_CORE_EN, because the rfs code now calls into the ethernet portion of the driver: ERROR: "mlx5e_destroy_flow_table" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined! This patch adds another Kconfig symbol to control the compilation of the RFS code, to ensure it is only built if both the ethernet support and the core RFS support are enabled. Signed-off-by: Arnd Bergmann Acked-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index f5c3b9465d8d..5efba14a1453 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -38,3 +38,7 @@ config MLX5_CORE_EN_VXLAN depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m) ---help--- Say Y here if you want to use VXLAN offloads in the driver. + +config MLX5_CORE_EN_RFS + def_bool y + depends on MLX5_CORE_EN && RFS_ACCEL diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile index 6b8da0b36acd..29118c1debb7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -11,4 +11,4 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \ mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o -mlx5_core-$(CONFIG_RFS_ACCEL) += en_arfs.o +mlx5_core-$(CONFIG_MLX5_CORE_EN_RFS) += en_arfs.o