From: Ilan Tayari <ilant@mellanox.com>
To: Arnd Bergmann <arnd@arndb.de>, Saeed Mahameed <saeedm@mellanox.com>,
        "Matan Barak" <matanb@mellanox.com>,
        Leon Romanovsky <leonro@mellanox.com>
CC: "David S. Miller" <davem@davemloft.net>,
        Boris Pismenny <borisp@mellanox.com>,
        Or Gerlitz <ogerlitz@mellanox.com>,
        Hadar Hen Zion <hadarh@mellanox.com>, Kamal Heib <kamalh@mellanox.com>,
        Maor Gottlieb <maorg@mellanox.com>,
        Mohamad Haj Yahia <mohamad@mellanox.com>,
        Aviv Heller <avivh@mellanox.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
        "linux-kernel@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: <AM4PR0501MB19409232F4E056237F2FAFFFDBD30@AM4PR0501MB1940.eurprd05.prod.outlook.com>
References: <20170630154412.3575760-1-arnd@arndb.de>
In-Reply-To: <20170630154412.3575760-1-arnd@arndb.de>
Accept-Language: en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
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: <linux-kernel.vger.kernel.org>
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
Content-Length: 1732
Lines: 46

> -----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 <arnd@arndb.de>
> ---
>  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