From patchwork Fri Jun 30 15:43:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106719 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2495628qge; Fri, 30 Jun 2017 08:45:02 -0700 (PDT) X-Received: by 10.84.224.71 with SMTP id a7mr25574137plt.235.1498837501988; Fri, 30 Jun 2017 08:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498837501; cv=none; d=google.com; s=arc-20160816; b=dZyR1iO9CQ456aj7IdtXLV1FtC3fXKcVVL3K0kQeeldn5rNGUbcHevkm7J7e1QiXA2 iGbh8wW3PNijFiXu18iDcOTZOK/u5QLPJq1BTUjtkXqcnuDM+usSUG1GaCBH2buejdDW T8W8NrxOq7Y6nVdHiP6pHp7q2YRq4gKcC8jNu31nRyHeRGBysH9z7dF4aJoxXwU0/lYl c0GW9DXU+i3YX8emfgMMWHj2MRSAR2UmOVKd+30rsBEgAjlkOhPEcOL8FeHMWU3F/Mis q02tXcEbvHBbiazR91X1Ss2tj4xJliL6vf1fmeZvwaRajwK1qB5frS27dB/y79iCQk94 ZpLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gm4O128q0kSYmKhx0ZVFVQTLtMLV5CWhy7IA1hGJk00=; b=ns6Jq8hf3un/OGFIjshEE7Qv2teKEVjB/nheuKE1kkdamAhWi6t0Ia0328FiFQk7xb dh4u/tUIxUhBkjdNEoR4KdOefcCOGQStglKg2YyrLjcCQkt2Dysy/cS4w21K3eGWGr9m 8+JbCdsj7NzaSig0rgIEUobEi8oTyZu8Pr9JxFsAAaibFTMYAX07r6TGBsY0GmGYLA+S exEhQ8SnJvrbP0IAN0RRuBK46vsgxsUAAMU/kQzzhUANG3Wxt69e1BSdnK0XSsB9Ho+R WEeDXKM5pD6s/yF/P4Ee+UHLVL7fozZtjBKwrpwYhrby8kW5VkQ1K7FSaCTUpyN5WI2b bpCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si1715062plb.498.2017.06.30.08.45.01; Fri, 30 Jun 2017 08:45:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbdF3Poj (ORCPT + 25 others); Fri, 30 Jun 2017 11:44:39 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:54552 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751613AbdF3Poh (ORCPT ); Fri, 30 Jun 2017 11:44:37 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0LaaTv-1e9uIg26dr-00mNqY; Fri, 30 Jun 2017 17:44:17 +0200 From: Arnd Bergmann To: Saeed Mahameed , Matan Barak , Leon Romanovsky Cc: Arnd Bergmann , Ilan Tayari , "David S. Miller" , Boris Pismenny , Or Gerlitz , Hadar Hen Zion , Kamal Heib , Maor Gottlieb , Mohamad Haj Yahia , Aviv Heller , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] net/mlx5: include wq.o in non-ethernet build for FPGA Date: Fri, 30 Jun 2017 17:43:52 +0200 Message-Id: <20170630154412.3575760-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9C/4OGRdaAejebMz8AkCX97MinjzKkI0mfuqUsBRXUUUwyw4OPQ +JAQ0rSjtMIM3ZqbUSHJonWAj1O4Y8BnRt7GdwQfudMK9a7/E21pzbTo+dEqxC9oKry2VfF 1L/b7CuZSKy0UR8J+T0Lczh+nkHkiTINZ1dNjS1vfc7VK6nT86I8qKgmfdDFDgEaqgPUwxv 1n6Q50JqXqHhs8x1jHeWA== X-UI-Out-Filterresults: notjunk:1; V01:K0:y1vQHUqebPI=:e9Gzxp1QgMZ2HCa8/wC08/ z/FBBbrVZyhlgT3aremxzV+2uybgj2+zmv5nMvtf29VpsNsC0VeIp2vQLOpaMKDWWVZiR9xtA 2YU6AYiKsYz10f+aF36/xttq74Ja8b+91rvMm5pHuJctyHk1/1IJo/ajlOpyMQdhpg3F1Cswj c+8SolsMUUBkHasAOxRYmfriW0MJzkw1JLewbuRfnHD4XNmdSeXlmQQND00fBjXENIcJXzu0p jtVYeB5rx2R04KpdYU2cCS4/tkP+IwsrVJoz62qC9knOpHxRhH4S7HckPjsJnfr4aUmMxbkex g2UPRvkLnvn0CoZvf6Y1TQisT77AkEhZxwZ/b4HKDwZPkSLcLIHcVcHRfzguu8EsKY6g4e0Xd slLwNhmtfYdhDRuebx/6UTIUWoMLeibKJdhAKj83DBoF5887JfpqQm4Vrqo8cix34Dto8Ya7b Cnuy5qqQm5sRmGe/lFTann2JpV7YIK8niQhD+ZhhdtpVbt9w+soI1o1Umt0xrqRGstA8iEMjS RShBEIPl5+DLGqJAXQKb5X7Exglgj7XLANG0LM3Qk4ajDcneyw3ts9piKSOF9PIssg6tI8Kki 0bkBMQtrImAYveYvym9Xdctr/i37Y7Vj5+eo/eSfjJq/tvT9aCJvdqvyQBycYRU7KvvJKPefX WAek3m47ifyzwFPEUAyuVVi3gRY818KQwg/PArd3wvHiOEW+2LaKTlUfw3QyeRfXOXos= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both the ethernet and FPGA portions of MLX5 now require the wq functions, and we get a link error when CONFIG_MLX5_CORE_EN is disabled: drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.o: In function `mlx5_fpga_conn_create_cq': conn.c:(.text+0x10b3): undefined reference to `mlx5_cqwq_create' conn.c:(.text+0x10c6): undefined reference to `mlx5_cqwq_get_size' conn.c:(.text+0x12bc): undefined reference to `mlx5_cqwq_destroy' This includes the library in the core driver also when only the fpga support is enabled. Fixes: 537a50574175 ("net/mlx5: FPGA, Add high-speed connection routines") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile index ca367445f864..50fe9e3c5dc2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -9,7 +9,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \ - fpga/ipsec.o + fpga/ipsec.o wq.o mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o eswitch_offloads.o \ en_main.o en_common.o en_fs.o en_ethtool.o en_tx.o \