From patchwork Wed Jun 28 20:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9815325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4DC7760365 for ; Wed, 28 Jun 2017 20:10:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FFA32851D for ; Wed, 28 Jun 2017 20:10:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3324727528; Wed, 28 Jun 2017 20:10:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA7D527528 for ; Wed, 28 Jun 2017 20:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751602AbdF1UK4 (ORCPT ); Wed, 28 Jun 2017 16:10:56 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57410 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbdF1UKz (ORCPT ); Wed, 28 Jun 2017 16:10:55 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mb5Gp-1dBnVv3mdn-00Khx0; Wed, 28 Jun 2017 22:10:37 +0200 From: Arnd Bergmann To: Saeed Mahameed , Matan Barak , Leon Romanovsky Cc: Arnd Bergmann , "David S. Miller" , Erez Shitrit , Thomas Gleixner , Or Gerlitz , Christopher Covington , Ilan Tayari , Nicolas Pitre , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] net/mlx5e: select CONFIG_MLXFW Date: Wed, 28 Jun 2017 22:10:13 +0200 Message-Id: <20170628201032.3178691-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:s10a55iQ+Vdg7t4Gxhmw+TfctSw3Ym5yy5zhaNFnAPGHH2os0B1 G0c3QMIcj6d8G8uTj6bR4bLHVk8vLXF/AvlmHDSPSROtkABREvnPnqpOzFCSVKg0CFBCHJt bCJ3dly7gy/Q8TCJe/Xz8pn/tBECymLjkoWckMJfA23KcZzlz+rFvy/v2q/45w+NHo/5Y46 9yl4aEvKIs7rS3yM4DJZw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Rt9blzZrDaU=:8SesmdkVEutArIKXuIkT4x +f0mpMTKA0Qq+zHlzl1RvdL09CKVSeuRiJP/IQgNqCjycpAn7dJKAFop/uuxhG3ECebnJ9nmU e4gA4MD/WvzlmR8VFKvHUIyC1VGtYUBVrZFrueUnCBvi0F0bY9RO1a/rEjMb231vMfUlLp7Xq 0oLkau6gxdKV2A1mti/P16s0cnof4quyIo8RY/+2vOJgSvRlhrbpQfBn/ygOws8OQfqPhrIjB U0sS8SkAgEiXBC/upPwR8bmSS6UCp8OqNYshFLQ+yF9R2BE+jxIS8y9dxFtpAxecXK9szM+Ej U4Jcrhg0AZbQEFJBIiXjR4oWYlNjwZYA/B8IXPVPK66XktFckTxBYS62fEgVQChWktcCVECry DxUjk0iPoaLmvu40rWqBzdlxsAnni4+zjPMB2ql10tVMnsvwT8mzb9l7hIG91/oezy1pvTeqO L05Le6G0rvPpeEpuUUkPDGj4lrk6Lb73BRpGtRSp06pT23Ne11Bf6IFU6mfDMVo/h3K5KJCYd Q2odFUllWCspEaO+3il9CyMHrUAlRSSkW53Pen9xHUWqxcwXi9K4skiW8Y5C3SOOG0DLLMdBd 4tO5UdOXZRrvV4m9nxhGShBVFQY87CyqK4Ra0qEMtisfrkupYXt4z1zCeNxGSEe5OxjRB9/CO 847BtUHHpx4n+cbRub0aCdVXtuoeVjz1p8xSAs4aVT4qWIEfM0WkLH/Rfm/WyeojBrEY= Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the introduction of mlx5 firmware flash support, we get a link error with CONFIG_MLXFW=m and CONFIG_MLX5_CORE=y: drivers/net/ethernet/mellanox/mlx5/core/fw.o: In function `mlx5_firmware_flash': fw.c:(.text+0x9d4): undefined reference to `mlxfw_firmware_flash' We could have a more elaborate method to force MLX5 to be a loadable module in this case, but the easiest fix seems to be to always enable MLXFW as well, like we do for CONFIG_MLXSW_SPECTRUM, which is the other user of mlxfw_firmware_flash. Fixes: 3ffaabecd1a1 ("net/mlx5e: Support the flash device ethtool callback") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index cf1ef48bfd8d..09edee060b03 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -6,6 +6,7 @@ config MLX5_CORE tristate "Mellanox Technologies ConnectX-4 and Connect-IB core driver" depends on MAY_USE_DEVLINK depends on PCI + select MLXFW default n ---help--- Core driver for low level functionality of the ConnectX-4 and