From patchwork Tue Jul 17 13:46:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 142144 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3686406ljj; Tue, 17 Jul 2018 06:48:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcYTeL7oteid4iRj5TIjiUneqhm8kRkt6skgF7wluSS+shNc/k8vrYDxqMnWxmhjfhQOnTi X-Received: by 2002:a62:fc5:: with SMTP id 66-v6mr750601pfp.237.1531835296474; Tue, 17 Jul 2018 06:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531835296; cv=none; d=google.com; s=arc-20160816; b=ddLYHZwU+Akvmf/RL8TPxEuv61Ov6+z3Xni+ka9m2SRwL+cVAlLk/7HwxPglqhA6Z1 E9I3/if/ftvxh6mq8F/NgFK8p5XAZsFv3PrD7H1KCKwYfhnEStl1sDqyE7aifybZIJ35 D3zHXQ+t4h73/vTaS910AarJnQSbqMK9SIa3LJYtNzrRv05jMTw3M6XOXJc0pLdzLxYW pa5yb7rHvX8iSGyvsigbwskFIIQZBIlx3dwu6sCuH7S1f/qDLYQJ3e9eFwCDZwmuSBzS +19XHZXxyasb5ntl2GwXY8kZESGaeRjC72p/CXlDboQfrDL/OIO/TsKgpfwjV2XnuawP c0mg== 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=39QowTiyw2pBeuJ/Oo0iYZ/NyK1wfuf53oNKuR8/zGo=; b=qd4Uqha53zZViJmt8eQDd6wMQpzb2UiXa5Kda3ocFyRGY0vMkGcjGHueB6rCdHIKmX DAappY+xIqwbT8OL46T9Ynhkz6uCel8NWZnJVm2XdMv36NGkv0+V08a4LnW+oPUqEat5 sIKI6EhsBiPDQItlJSk0nkDmM6CNZJmsdEcSPmVJheVQgNeM6OqKCUczIPztC/T4WT6X KTt4x/MWwVhS5xeLeMC7CzjqKVqjPH8OHPMS7x6jyqHPfKUm8ZywZkOmbPdbKfNEFUhT F62Ym9z6xysFy3p33Z5OBf80rXUmHYov9WO6EwQTB0Ex45btWih0E7qm4LTQQTSjShxf pY7Q== 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 c15-v6si896282pgw.550.2018.07.17.06.48.16; Tue, 17 Jul 2018 06:48:16 -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 S1731709AbeGQOU6 (ORCPT + 31 others); Tue, 17 Jul 2018 10:20:58 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:43079 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731573AbeGQOU6 (ORCPT ); Tue, 17 Jul 2018 10:20:58 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0M4mmf-1fxdTO3J2j-00z2A8; Tue, 17 Jul 2018 15:47:59 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Aleksey Makarov , Radoslaw Biernacki , Felix Manlunas , Sunil Goutham , Vijaya Mohan Guvva , Alexander Sverdlin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: cavium: add missing PCI dependencies Date: Tue, 17 Jul 2018 15:46:34 +0200 Message-Id: <20180717134756.3447762-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:VvaSDVWeXPwusucKUtJPk7TWrAODsv33WpRbynSu/LXc6mlsubi aivXqR/HRz4LqGwnjDJ35V1PWYN1QNvXh6HhBFx+NRa3bjrol0WuiOKHtESJknhA0HWj4qG T3bzELEwIzhbZhthF+/krLKDXtuH/R35sq31qd5rlhcGiikJiUUXSB4XsF2bRadONPpt1P9 qXjQ8p78WOVm9EDaN1AdA== X-UI-Out-Filterresults: notjunk:1; V01:K0:J9PsQi9gCeo=:TnSHoxXu1pmoP/AyB3beAH f1Wg5iwEiLlDDz812xuEKtxiQpYDx09pPWt39LkT40o89eEtrUJ8HBoQB0uQQ3zAwzM3uCB0n TFpZv1DvlzGOKmUWofaYdzJuKMfwXA4xsUWnwuzGakb5kKiuRKVQ+VGi3bLz7vVtOVsiGFUTn 6fMn6VXaaCwDmAezoBYA7YVOz3+JzHQ5XytFvo0bj19EIPPGnvU+D/mxSJyIA86YziI/bCkOh oqXrRaD870qR0KfgTUhC0rQhCSiDdMr/Pg9dLsCkfibLXJkq409QcmUtv5oqx8Qx2dDosye8j KhFJpccpwDThxMaLanHP4fLLdIDgTNzyELk+fkWYGxiYaH/Ztb02WBcF4Ox8gBXo9zxj/D97y Bnx1YtVLR0uTheJJNZQJ2iUE5zM9GJaw803eri74pkw79NBfSp8L8kSZ5bszpoxvxkHgVq8yI amr6RoAr6Ir9yF43V/Q/66VuBeG6PfbuK8YYeVx0Vw2jttNiPXy7MVh3NiS3J7m2OK3gUNAYz +WqkD9Ca7W50P0KqJmNxfhYAuEeQCJutlbnlduvRXzawbmx/y4j0GfK14APmjLJ4i17ey16LX 284FSp2iDAVSwh0TbWdnnZHjANlgtNqxf6D/1HMBK4q6DP5zKUVKbZc652XX2eBYmvoTz/+8t JizqyEwTOYAO4lA4Av53o1iGW/rSBVUHjD9axurQZianJ7u8+WK9+tck33csR6eOqJdI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While some of the cavium drivers don't require PCI support, most others do, as shown by these build failures: WARNING: unmet direct dependencies detected for MDIO_THUNDER Depends on [n]: NETDEVICES [=y] && MDIO_BUS [=y] && 64BIT [=y] && PCI [=n] Selected by [y]: - THUNDER_NIC_BGX [=y] && NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CAVIUM [=y] && 64BIT [=y] - THUNDER_NIC_RGX [=y] && NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CAVIUM [=y] && 64BIT [=y] drivers/net/ethernet/cavium/thunder/nicvf_main.c: In function 'nicvf_set_irq_affinity': drivers/net/ethernet/cavium/thunder/nicvf_main.c:1095:25: error: implicit declaration of function 'pci_irq_vector'; did you mean 'rcu_irq_enter'? [-Werror=implicit-function-declaration] drivers/net/ethernet/cavium/thunder/nic_main.c: In function 'nic_mbx_intr_handler': drivers/net/ethernet/cavium/thunder/nic_main.c:1135:13: error: implicit declaration of function 'pci_irq_vector'; did you mean 'rcu_irq_enter'? [-Werror=implicit-function-declaration] In file included from drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c:27: drivers/net/ethernet/cavium/liquidio/octeon_main.h: In function 'octeon_unmap_pci_barx': drivers/net/ethernet/cavium/liquidio/octeon_main.h:97:3: error: implicit declaration of function 'pci_release_region'; did you mean 'pci_release_regions'? [-Werror=implicit-function-declaration] drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c: In function 'octeon_mbox_process_cmd': drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c:263:3: error: implicit declaration of function 'pcie_capability_set_word'; did you mean 'has_capability_noaudit'? [-Werror=implicit-function-declaration] drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c: In function 'setup_cn23xx_octeon_pf_device': drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c:1315:22: error: 'data32' is used uninitialized in this function [-Werror=uninitialized] drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c: In function 'cn23xx_dump_vf_iq_regs': include/linux/dynamic_debug.h:135:3: error: 'regval' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/net/ethernet/cavium/liquidio/lio_core.c: In function 'octeon_setup_interrupt': drivers/net/ethernet/cavium/liquidio/lio_core.c:1067:17: error: invalid application of 'sizeof' to incomplete type 'struct msix_entry' drivers/net/ethernet/cavium/liquidio/octeon_main.h: In function 'octeon_unmap_pci_barx': drivers/net/ethernet/cavium/liquidio/octeon_main.h:97:3: error: implicit declaration of function 'pci_release_region'; did you mean 'pci_release_regions'? [-Werror=implicit-function-declaration] This adds back the minimum set of dependencies to get everything to build cleanly again, but leaving the ones that build cleanly. Fixes: 7e2bc7fb65d5 ("net: cavium: Drop dependency of NET_VENDOR_CAVIUM on PCI") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 4c3a5c354497..80e2e93e4aad 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -14,7 +14,7 @@ if NET_VENDOR_CAVIUM config THUNDER_NIC_PF tristate "Thunder Physical function driver" - depends on 64BIT + depends on 64BIT && PCI select THUNDER_NIC_BGX ---help--- This driver supports Thunder's NIC physical function. @@ -27,7 +27,7 @@ config THUNDER_NIC_PF config THUNDER_NIC_VF tristate "Thunder Virtual function driver" imply CAVIUM_PTP - depends on 64BIT + depends on 64BIT && PCI ---help--- This driver supports Thunder's NIC virtual function @@ -35,7 +35,7 @@ config THUNDER_NIC_BGX tristate "Thunder MAC interface driver (BGX)" depends on 64BIT select PHYLIB - select MDIO_THUNDER + select MDIO_THUNDER if PCI select THUNDER_NIC_RGX ---help--- This driver supports programming and controlling of MAC @@ -45,7 +45,7 @@ config THUNDER_NIC_RGX tristate "Thunder MAC interface driver (RGX)" depends on 64BIT select PHYLIB - select MDIO_THUNDER + select MDIO_THUNDER if PCI ---help--- This driver supports configuring XCV block of RGX interface present on CN81XX chip. @@ -53,6 +53,7 @@ config THUNDER_NIC_RGX config CAVIUM_PTP tristate "Cavium PTP coprocessor as PTP clock" depends on 64BIT + depends on PCI imply PTP_1588_CLOCK default y ---help--- @@ -66,6 +67,7 @@ config LIQUIDIO tristate "Cavium LiquidIO support" depends on 64BIT depends on MAY_USE_DEVLINK + depends on PCI imply PTP_1588_CLOCK select FW_LOADER select LIBCRC32C