From patchwork Tue Feb 23 10:36:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102706 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1756312lbl; Tue, 23 Feb 2016 02:37:14 -0800 (PST) X-Received: by 10.98.75.196 with SMTP id d65mr45232168pfj.96.1456223834207; Tue, 23 Feb 2016 02:37:14 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id on6si46486750pac.30.2016.02.23.02.37.13; Tue, 23 Feb 2016 02:37:14 -0800 (PST) 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 S1752830AbcBWKhL (ORCPT + 30 others); Tue, 23 Feb 2016 05:37:11 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:58616 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbcBWKhI (ORCPT ); Tue, 23 Feb 2016 05:37:08 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MF9xL-1ajwhD1YVv-00GGhC; Tue, 23 Feb 2016 11:36:28 +0100 From: Arnd Bergmann To: Ariel Elior Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Yuval Mintz , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] bnx2x: add a separate GENEVE Kconfig symbol Date: Tue, 23 Feb 2016 11:36:02 +0100 Message-Id: <1456223774-1383513-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:qdTly4GnE6tk7Qygz4JCloWMuFci0SsxPOXEdDz3cYb5+tEOJ8D PTs6Cp6pbGo4COyvtez2OO5ldSxWvRQ+m0WfCJGuq6dmnTd6ctph9kqabTR8yTzXU2i8mjf EqHwNLYTfFbiwjxRg6PKjmkh+Ci8PuRDUqkKHgW7o2gHNTRkddmERMbXG0xiCCcSGcZFbG0 V20P8RyLGxo+I7uQSX1TQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:/Qi1PoygJGQ=:k4ElPn0z/70e9qcSHzPNXL gehJRi8pe3Q2gOc5rR8hdGi+jhLUmbhgG4slLf6wmnZCEETsfvJsnlH26V3v4yJlYQ1FZMPkc AKPfDaD52cwaTw/z4ygw72PXVceDVEHKCrZZ6TBg5Zjl1Gz6efLJ+qUMantBmnv5yPyQoYm1H w8A6wnxz8FKwIogFaY76ClpE73L5FCXbgPHtqHVyD3hzOQtPbnd+CZuduFM0JFSXiDIdmyRrd OF7P3iMm85imN79jJaJLplFDsN2oO5B3PR8g3xin2BCmgfYhHwMThplNQSAAJXy78Z/Qy9ajI KigNU/cQQI7868dUS+s0QLekF6JdDx9t0X3mANZyIuxbNK54A/svjmsG/7ntMRIeCvkPxrOOf T3pQRCJwXh5ehYRu0X8L9ABF9lUKKiYuQGGr6P2rFqtTiHp/k5nSBKSch7I3iFAQemFuT2eUs vXp/EBh/RXXoo2P1sFwqCDHocUQ7bY0lQ7z/UgegYWoDDgthDj7bIl5xTPyZljSVDpP7UOUyr FN9pPuCMhgTzvCQgGbPsHQTpOxCQxeGGaTY1AWt4Cn5K0/dY/kapmOMuKNa2IitQTB24njFJX 77s0QvjgBBdYlKPiisLifSilV7QHBDQlz2Cc5aFXYUsfGASQWsy37OcKWGt+b/Embuo6bxkfY ZO5eIF9zt6Nc0WjJG9aa12oDRln7hw0mn+5qBwfAtrI6+4m0wHEL9AKbFsLNibh1PtJ8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_GENEVE is built as a loadable module, and bnx2x is built-in, we get this link error: drivers/net/built-in.o: In function `bnx2x_open': :(.text+0x33322): undefined reference to `geneve_get_rx_port' drivers/net/built-in.o: In function `bnx2x_sp_rtnl_task': :(.text+0x3e632): undefined reference to `geneve_get_rx_port' This avoids the problem by adding a separate Kconfig symbol named CONFIG_BNX2X_GENEVE that is only enabled when the code is reachable from the driver. This is the same trick that BNX2X does for VXLAN support, and is similar to how I40E handles both. Signed-off-by: Arnd Bergmann Fixes: 883ce97d25b0 ("bnx2x: Add Geneve inner-RSS support") --- drivers/net/ethernet/broadcom/Kconfig | 10 ++++++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) -- 2.7.0 diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig index 19f7cd02e085..18042c2460bd 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -149,6 +149,16 @@ config BNX2X_VXLAN Say Y here if you want to enable hardware offload support for Virtual eXtensible Local Area Network (VXLAN) in the driver. +config BNX2X_GENEVE + bool "Generic Network Virtualization Encapsulation (GENEVE) support" + depends on BNX2X && GENEVE && !(BNX2X=y && GENEVE=m) + ---help--- + This allows one to create GENEVE virtual interfaces that provide + Layer 2 Networks over Layer 3 Networks. GENEVE is often used + to tunnel virtual network infrastructure in virtualized environments. + Say Y here if you want to enable hardware offload support for + Generic Network Virtualization Encapsulation (GENEVE) in the driver. + config BGMAC tristate "BCMA bus GBit core support" depends on BCMA && BCMA_HOST_SOC diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 81fc51c4ec2b..5c95d0c3b076 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -59,7 +59,7 @@ #include #include #include -#if IS_ENABLED(CONFIG_GENEVE) +#if IS_ENABLED(CONFIG_BNX2X_GENEVE) #include #endif #include "bnx2x.h" @@ -10078,7 +10078,7 @@ static void bnx2x_parity_recover(struct bnx2x *bp) } } -#if defined(CONFIG_BNX2X_VXLAN) || IS_ENABLED(CONFIG_GENEVE) +#if defined(CONFIG_BNX2X_VXLAN) || IS_ENABLED(CONFIG_BNX2X_GENEVE) static int bnx2x_udp_port_update(struct bnx2x *bp) { struct bnx2x_func_switch_update_params *switch_update_params; @@ -10201,7 +10201,7 @@ static void bnx2x_del_vxlan_port(struct net_device *netdev, } #endif -#if IS_ENABLED(CONFIG_GENEVE) +#if IS_ENABLED(CONFIG_BNX2X_GENEVE) static void bnx2x_add_geneve_port(struct net_device *netdev, sa_family_t sa_family, __be16 port) { @@ -10327,7 +10327,7 @@ sp_rtnl_not_reset: &bp->sp_rtnl_state)) bnx2x_update_mng_version(bp); -#if defined(CONFIG_BNX2X_VXLAN) || IS_ENABLED(CONFIG_GENEVE) +#if defined(CONFIG_BNX2X_VXLAN) || IS_ENABLED(CONFIG_BNX2X_GENEVE) if (test_and_clear_bit(BNX2X_SP_RTNL_CHANGE_UDP_PORT, &bp->sp_rtnl_state)) { if (bnx2x_udp_port_update(bp)) { @@ -10344,7 +10344,7 @@ sp_rtnl_not_reset: if (!bp->udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN].count) vxlan_get_rx_port(bp->dev); #endif -#if IS_ENABLED(CONFIG_GENEVE) +#if IS_ENABLED(CONFIG_BNX2X_GENEVE) if (!bp->udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE].count) geneve_get_rx_port(bp->dev); #endif @@ -12557,7 +12557,7 @@ static int bnx2x_open(struct net_device *dev) if (IS_PF(bp)) vxlan_get_rx_port(dev); #endif -#if IS_ENABLED(CONFIG_GENEVE) +#if IS_ENABLED(CONFIG_BNX2X_GENEVE) if (IS_PF(bp)) geneve_get_rx_port(dev); #endif @@ -13078,7 +13078,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { .ndo_add_vxlan_port = bnx2x_add_vxlan_port, .ndo_del_vxlan_port = bnx2x_del_vxlan_port, #endif -#if IS_ENABLED(CONFIG_GENEVE) +#if IS_ENABLED(CONFIG_BNX2X_GENEVE) .ndo_add_geneve_port = bnx2x_add_geneve_port, .ndo_del_geneve_port = bnx2x_del_geneve_port, #endif