From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752455AbdF3S6Z (ORCPT ); Fri, 30 Jun 2017 14:58:25 -0400 Received: from mail-db5eur01on0070.outbound.protection.outlook.com ([104.47.2.70]:24910 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751918AbdF3S6W (ORCPT ); Fri, 30 Jun 2017 14:58:22 -0400 From: Ilan Tayari To: Arnd Bergmann , Saeed Mahameed , "Matan Barak" , Leon Romanovsky CC: "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: RE: [PATCH] [net-next] net/mlx5: include wq.o in non-ethernet build for FPGA Thread-Topic: [PATCH] [net-next] net/mlx5: include wq.o in non-ethernet build for FPGA Thread-Index: AQHS8bfEcnFaSevjBkyYN34pAMSn8aI9wZCA Date: Fri, 30 Jun 2017 18:58:16 +0000 Message-ID: References: <20170630154412.3575760-1-arnd@arndb.de> In-Reply-To: <20170630154412.3575760-1-arnd@arndb.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: arndb.de; dkim=none (message not signed) header.d=none;arndb.de; dmarc=none action=none header.from=mellanox.com; x-originating-ip: [192.117.110.221] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;AM4PR0501MB1924;7:3hEZQMm8UHFkp3dzlt45AytQyq9fXvTstsTAqYG/zjpL7AqA+NEw7b4SZKDl6rVhGpC2y56v+0o35Oo198MiJ+6dUzb5urna1b3DDIY14D7n+IHHmPNUEvKRD+5ADIcuw5fo1skF4LvYZDJJCiViFyjK9GCs1nmEA5n2soyrJf0sl0qMjO3J6mYpzT6bdyigwUOMWGAtXTkpma2+hZOyeeSwutzAypcxixyV3DM/i4v1LCX5KdOyiUHvKgr32BKiiUJCa3LXTlxe38ZZaLrpCfuMj0f6qu5DaIxWiAJF4Jbb+wdI6Cqf8OfyjyJGR8WyLxie2sK777rYFiCTTndWbnSEAUrY9TmR3NOVRYbJjH1zqT+3lksYDr11x6m8uQRqhv+R1Ir1IRQUrAIvtD6fmY3wmvUqXbi7CNFptJl2LWH1w/BRciRyxWGqw8/XVWLiearh0Fi70XIsFTjwjJQT/mFw9fSg9lwvRhG4ySM7ip2q0QGWv8aM+QPaXIjKP8IfdVrdbRQ4t1UlmCieq5FOCFitBGozl/CE2EPArEebbSWsPETdPO0OS/Z5OT9Nw3eeqAZ+K+XvRV3HVRYAuUCc1oiYtjKaxSR74D0lPQHU0JOElbIoBfJNjN/r6B3pDHqcPm9R/Swipb3X1H6ZNX8+RbT52FumxbLCKfnpJyeZjA56cAI/SHMQYs2Md3sbDuWEQMSdMFzhQgg3CrZljIOf0sN+n6mz9TEH7rxeDTuv/txfZ1WqDg4c0W5lDPm8+CHCAOejommzVI6ufYSaz2E3Dg+69jfYcsYxtNiCB3E3qGo= x-ms-office365-filtering-correlation-id: aed801a3-5786-41f9-20de-08d4bfe9f7b7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(48565401081)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:AM4PR0501MB1924; x-ms-traffictypediagnostic: AM4PR0501MB1924: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(133145235818549)(236129657087228); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123562025)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:AM4PR0501MB1924;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:AM4PR0501MB1924; x-forefront-prvs: 0354B4BED2 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(39400400002)(39410400002)(39840400002)(39860400002)(39850400002)(13464003)(4326008)(99286003)(229853002)(478600001)(5250100002)(55016002)(305945005)(6636002)(2950100002)(8936002)(54906002)(8676002)(66066001)(74316002)(76176999)(54356999)(3280700002)(6116002)(53936002)(50986999)(86362001)(3846002)(38730400002)(102836003)(3660700001)(5660300001)(6246003)(9686003)(2906002)(14454004)(2900100001)(7696004)(33656002)(25786009)(6506006)(6436002)(81166006)(189998001)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM4PR0501MB1924;H:AM4PR0501MB1940.eurprd05.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jun 2017 18:58:16.9404 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0501MB1924 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id v5UIwWLL007131 > -----Original Message----- > From: Arnd Bergmann [mailto:arnd@arndb.de] > Subject: [PATCH] [net-next] net/mlx5: include wq.o in non-ethernet build > for FPGA > > 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(-) > > 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 I believe we would prefer to move wq.o to mlx5_core-y. Otherwise you might build it twice. > > 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 \ > -- > 2.9.0