From patchwork Tue Jul 17 16:23:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 945213 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nokia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="ccY3EsGw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41VQbJ2CLpz9s3Z for ; Wed, 18 Jul 2018 02:24:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729719AbeGQQ5v (ORCPT ); Tue, 17 Jul 2018 12:57:51 -0400 Received: from mail-eopbgr80133.outbound.protection.outlook.com ([40.107.8.133]:48265 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729641AbeGQQ5v (ORCPT ); Tue, 17 Jul 2018 12:57:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qCNr9mskLFfvMV+ga9DSYGklAkkuE9/wKXcLjp4Hsyg=; b=ccY3EsGwJRhy4xiATpTS/2UA+mTjkgxkVaV68tzATVmurkYqoOlXTbsKQXalbLyHYGUpTrXJsgFmeMTf4DyAOBbxIzZUD9kNEeLYCNkjOobktk0XMpSkHjKZGt+WWPe5g7ybTXmTDhsKI/lxknQUrqaWR1urjapw4y2sNyojSK4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alexander.sverdlin@nokia.com; Received: from ulegcpsvdell.emea.nsn-net.net (131.228.2.20) by DB6PR0701MB1878.eurprd07.prod.outlook.com (2603:10a6:4:9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.13; Tue, 17 Jul 2018 16:24:18 +0000 From: Alexander Sverdlin To: netdev@vger.kernel.org Cc: Alexander Sverdlin , "David S. Miller" , Aleksey Makarov , Sunil Goutham , Raghu Vatsavayi , Vijaya Mohan Guvva , Andrew Lunn , Arnd Bergmann Subject: [PATCH] net: cavium: Add fine-granular dependencies on PCI Date: Tue, 17 Jul 2018 18:23:58 +0200 Message-Id: <20180717162358.1508-1-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-Originating-IP: [131.228.2.20] X-ClientProxiedBy: HE1PR0701CA0058.eurprd07.prod.outlook.com (2603:10a6:3:9e::26) To DB6PR0701MB1878.eurprd07.prod.outlook.com (2603:10a6:4:9::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b2ac7c04-975a-4932-81c4-08d5ec01bfa9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:(109105607167333); BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7193020); SRVR:DB6PR0701MB1878; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1878; 3:y45vZXuefwuyCs6EV+0XtSK9TUWRCRGTu33Wv8c0ICEVb5CiJojM5hzX5+L26xsj9uGX0xAW+ToP7L961zVue+JiKpgCq/3C/n/+MZfLVE2j5HJKpoeJw3WA6el2ukD1sL/hbMjjp3h/VZZ9ckXW07gX+SPGrs5LdLbpuKuGyNql2nt1RGwpPIqfxNIyjIIZ4SI2TplalGXpG0Q4xSOwJXiIHP64kPznRs6JP5cBvnvU4rW17lX0oj0CPRB6mhhmIG7NCzLNhgezq7KH9GM6XvqDTKH+xZ91fKtItJUTwUo=; 25:PRqqjeeXbcHfEat+RgzoIM5PNj+maeFW77VjJQLloE3W1LLYN9vvaHcjxVIayf34zyEapW49WcIwl5pgDlHEB9dvKp7e0vEQXS+k2L4DccCywiHpw+QgRssRCGArxXFG083WiMxHVBZv1KeR7ZiJ2+HGnkUBT0zkbt6/FPn431KZo2KsBpVfVZy3YCP4L6BcGmj4NblxVPv1EAVrHvY0q4d3UqAvvhG/DuMajvyP6A3Avb5EoHNT6P/jbvx3x0D6hu/HX/0T5t0EaWkKkZlC1E5R7Lt2ew3W7jbgxMotRLV2xaxDZrLwkKN+20PJlfY6z+m7nFjMJ8ok4reyhR+6eg==; 31:9MUSbjcxCi+grfaJIJBteZMCrV/957GGPYQZuptHFf2sPPUQgsnuC5nxptymwq2hU2NzYyj529jR72FjChuS4UUe5OENUsiJPyt1jKVr9s1WvtalAwDpLXFCxA4fSRlpshZtvLULJDBg16U3g/vs8xe2ZP/q9qohoqkIbxqO49aJUsZS6rqJW3I2IivOWqR4A6zo1Imzoo0CTdTAJMlOITGkZnyZFx0fObqGPGhgzhs= X-MS-TrafficTypeDiagnostic: DB6PR0701MB1878: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1878; 20:6INJPflD1UZ6LH6Ar2Qa65YLvE4h6vS7nFQ7DCp2XYrHqZUmSGUL9WWhTRE6xaVhiCuwyXgV6pqRUocCqa0bnyfiF7QUCupcXsnoiv4HPPaJnj9aqR2wU4HFuYFx3dFiL4ufTuXcxsjrVxsClnjuWFfmNGZk0RTM3x9sLxK+HFNxIuuHue8nHH1Ox/wdKaGHqdJ87uNfDwF0/CchkRJ3n/h/QjCgK4g6ztEWRbbyOOI87Jsek7jkUbeHbYF4WF+hLqT1dtELRWb3WuVbFHb+LkzQvFdyiCpxp/MbcfBqsf64CckIX1Jy5k0ZR6dGOjU1bZ+xv3V7c4zbGD6U4WOYpcpFn34itjS39pUwYxMkLX9aWSfB09aLa3d+T7IVTxkadAMWnXjeGPXV4CH21B8MY7t1wC595XS0V2HKgA3e086NLVfW6EzBHLj9lbdKN9vXDnpxsbrsjIWl3i3TZ1eMieaimo107CVG8ju5GIKLGIu3QR3dbZMp/UNOXjzkUCXpLqxgU8KvajzAm8NQ2Q7M5GIMLLHXQk9OMKLdUo2oSzE6REV6S21KJB43IdKWAQk2FSQDK49RYCVK5Uarnn+Zxxh5p36/xMWmhLOYzINCwt4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597)(109105607167333); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(11241501184)(806099)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DB6PR0701MB1878; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB1878; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1878; 4:cqd6cfceYPIsXpt46kHnyOMQdgpprqSvITWi4885ObHBb1R/f0QwRrzBsj855VXKedCsi3B8gAtqUm1lanp8xX+VznZceC4grBGkniWul2KPWSBUMz7rf+4/Pno43h8zWt/JiDcYy9tyObxZxoYdGOSgbbS2EYX8oXewB9iNVrgLfpJwN/WIDgi4T1+yxCqZTRoU8j+yGFJVpMusymNFGki88Ru4KDK60AEo3mxZT5DYQl/hhGzLNTv69yB14IYrpYoNxwmU6IH2LRZm/pQSISgkbCuCNLDa+INmvLae410DWnF1F7vo1+DjygIgKbBMP+YGTkIMncKsl98PllbYomtTKRpl21VPzX7ZPFSsFpk= X-Forefront-PRVS: 073631BD3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(396003)(136003)(366004)(346002)(376002)(199004)(189003)(476003)(53936002)(2616005)(1857600001)(7736002)(305945005)(105586002)(2906002)(48376002)(26005)(50466002)(106356001)(2351001)(2361001)(50226002)(3846002)(44832011)(386003)(68736007)(6506007)(6116002)(97736004)(186003)(486006)(16526019)(1076002)(956004)(478600001)(52116002)(51416003)(81166006)(8676002)(36756003)(6916009)(316002)(86362001)(16586007)(81156014)(5660300001)(6666003)(4326008)(6512007)(47776003)(66066001)(8936002)(25786009)(6486002)(54906003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB1878; H:ulegcpsvdell.emea.nsn-net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1878; 23:RGDMWOpJ8KO8/95Cp73JJYB3p52qoAEThsgWLDFVxS3IG9V1YAIR0fBcMulpW36f8caVHiG3HYdHfQA3u+KVSr7oEqeiI3brT0+3eblNG5R0nMWmucgujTp0ofZJiCGg68ZJAAbS2U9nKdubFG8ZfXZGpOI3PGkBzCgkCmRL9RlyKPF5zVf2NaOHZuMt5DJvxHVRw/LEI4g8j9iNZ4OH7F0qwJni19XLs+fo2UR7DqrDXuocGTU/Za7u1THYP3gDu0yyNqgDfD7Bu2CxTgVoM4L/PWyRJl+MyfDCFutMuEPkhTfN0HoRadT3vWOgfQGmPajMplfk4ZBhVr2mV1pfB//7XgJMkVHHPQ2/ln93CSQ+YSbrG6bA2uFyH1GIKPva4Lj9jLerFT6xDKwnacpvV4VeZ1qOnEfNSFIwL80lLcCq4EWLnFDY3F/JyeLjFyWkSuVWWgRAUv1eM2EbLIKyMcM3quLrOozdu0psg9msQpzdLkkIGtjnqA5986E1fc+goNVbHy+YDCHyob4q4D4s6jecBZgQBS1tIBZFTtRClgflGv9mY4FSYyxGP4ryX3HefWjByCgl5o/nFpyA7hL5lLWcupWaTX6tCQ7EzwVyCM+cDCtFzgod3OAAnHl+pyn2uPHVWx8TJApKhle4oyIigZ6I2uTaDpp6asjtXBeP1ojOBFMdQPEK/edechRD6gMCnd7GLesQlgXlC/dy4bxmSGRuN9QDYV+dDDubu6Q0pSNXKqxgTxpx6aaUtkd2Idx4tcf2Cl4VT2iRv7T8YdCn4/V0ahA3EJb5mZKGIf+aYcgwaWD00IUhU2AioCHe6NqdpK2JzTTl/ifFeCKGPPiJ29FYirLd1YEhw6zbb9qEX0cH3zF/ouiWVYgtTOMpq82FaXM74Gp06RoTjsZ1+szFBwIs4EjIYLTBVCc8VclOsGoYehwgWsgsPImOAs7qsFQFNwv2ALIEfQEZziFVwC0l0bGasBCvbRFnH7B1Zxugk2H0gMMwGAw5hGrKH3vMy4hkCMoFk3wafEAOnZOOgwCnMqZPHljym6OGyOutrn2Ui1btCvVxXfNlohmwk5gRuPlBEgQBD6mJ8UFBtDOSXopCLjAteW3cvGfJ/CEKZJW4fRkg+ngelJhQBJ4AmQnQhuNwKfAlDtjm13MkqV4gpd3i06KFi9wtKteI+UlFpWB/HYCpINSCI6bdjQoaihg2qCZu7BQ1/zYWEU71ltHvApEiEg== X-Microsoft-Antispam-Message-Info: IinywfNgG9xcP44trOFfVZhZyXBiYp4PUz4sGwNqbzPtLDtOZ3Z5+oG/xmSlZq0VSQ+6JOMLEeG3u8SWpcU38U17E0+BnEgSbW8tq9mhWjYhQKu5bEbim6Ek8FhYWqQD9DRBwn5k/TdVGkZqy+fhgqjI7xszmcEDVRYq7WDqB+BMzzD0Lmv4Cm/29/kA/M/ycuEH45hlzsjhARs1gHjFblqa3UX4wW8f5Gx43jpLKkoT8pAzsi2yLGws/GxPyk0z7QomYP1E2+UHiry1fKe4fKLTd1yHzew3WR/j3fVqZut+fNWG1Sia+pkakwwN7iL/G7a4nuTCthMIr0F06OODauIY3K9ojdJNxtsnZeuxI4E0yP7bf/hLSlZI40qb/l0iOXs3lLBbcf8cgXS7T2Yg0w== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1878; 6:bMcDLxEcEmeqzbACWLNqij4WXnU5rsLxj2vRsh4FqeO5/OkQ4ojyxOCi1vOkQlb2sN3trX11mXdua8L4I9dQ27GJDOf0BkeOOi4M4fLy2gxYGdxJkKwYd7/6YWBATdseptnmmN67yKKk0RXziYdYm+FRJv+zUHtH1D4r6geeg7Wi4nMxrQ7exGANUHqjip3wGAnOvohkNRMUMRxz1sd+V027jlwj3iu8W4rBWW6NTP9b2fxKQpZOCAC/BcnwIxRsdzNNEwxTB2qCAV8d1a4Hjq1nzFohVkJYC3FwzcO7sH7+rJXHmVrkqTohJV/OljpCorP/imxNT516gZydGeq4llgWLWgjGLvKdomCks4Jn6ebc8tHoEqkBDQR6nmUmZ3fnAv8s/Nl+IPv1BBO8sCv6dgHZQk5vrk7E/OwwFD/Ta5E050THErcvWu2xkZAF52PUhzndHaChEffUu5toEfxxw==; 5:YmTtNGvt3o5EqsH8LI07cBnmU7y7ypE5A5iQYq3qcuWPyUqInRVVqasZ7t4onwNEZHrt1g0VrpSSenpHx/N0QVylb2M3H3dXkAgY+D30gAA/CwD3+U2/ZeYeaGOfpBZF87MWXWZwFOHb0968K9vmLWT3TFsn56DLscKFap4i8qc=; 7:yH0eCmwJqzpD5hhl32WmilnpBvYYi+m2j0Vr7XuXCB56kf1HzC2FapzhezFyy6yYN77t+0LGPhjJO5qPoLjyWYysk8EEFm8ZSNlL66Vbsg41mZ/vKBRCpfE/24P49HJUJ769fB0e1LG1fOOW2XA7vw1xuZPd4UjRZRLyDqxu6nAMt040vj+AQe83p4ihKcawwBE9ZyGwcBeZ8boV1WT/EuJkGlHP9/COnrAyb+snS/kssA5utCw67scPi1vnOA9E SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2018 16:24:18.8955 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2ac7c04-975a-4932-81c4-08d5ec01bfa9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB1878 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add dependencies on PCI where necessary. Fixes: 7e2bc7fb65 ("net: cavium: Drop dependency of NET_VENDOR_CAVIUM on PCI") Signed-off-by: Alexander Sverdlin --- drivers/net/ethernet/cavium/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index 4c3a5c354497..ba65ed49f480 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,13 +27,13 @@ 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 config THUNDER_NIC_BGX tristate "Thunder MAC interface driver (BGX)" - depends on 64BIT + depends on 64BIT && PCI select PHYLIB select MDIO_THUNDER select THUNDER_NIC_RGX @@ -43,7 +43,7 @@ config THUNDER_NIC_BGX config THUNDER_NIC_RGX tristate "Thunder MAC interface driver (RGX)" - depends on 64BIT + depends on 64BIT && PCI select PHYLIB select MDIO_THUNDER ---help--- @@ -52,7 +52,7 @@ config THUNDER_NIC_RGX config CAVIUM_PTP tristate "Cavium PTP coprocessor as PTP clock" - depends on 64BIT + depends on 64BIT && PCI imply PTP_1588_CLOCK default y ---help--- @@ -64,7 +64,7 @@ config CAVIUM_PTP config LIQUIDIO tristate "Cavium LiquidIO support" - depends on 64BIT + depends on 64BIT && PCI depends on MAY_USE_DEVLINK imply PTP_1588_CLOCK select FW_LOADER