From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B23CFC169C4 for ; Mon, 11 Feb 2019 11:56:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CFAF218D8 for ; Mon, 11 Feb 2019 11:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549886185; bh=AHtauHFUjNwAcqwB8thsykudxNY6WJDoitdBLFFwZjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xb5p8Fwi5DGOYM+cd0HLMKSzAz9Wy1eObASzOHXmVgXeAGkl4B2EOiEwrWyAvlEYp zNFqo60HFgOZ3SFfk5zuxZOq8CzcAOsN+yMzUVO4AjUeoMQhWuG8JGBO+K8rq+Nb+P C1r48e6hPk5q8SDt4h+n7yyzMZnGbO2iPT0iMa+Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727165AbfBKL4Y (ORCPT ); Mon, 11 Feb 2019 06:56:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:60908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726053AbfBKL4X (ORCPT ); Mon, 11 Feb 2019 06:56:23 -0500 Received: from localhost (unknown [77.138.135.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EE92218D8; Mon, 11 Feb 2019 11:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549886183; bh=AHtauHFUjNwAcqwB8thsykudxNY6WJDoitdBLFFwZjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yD74V3B2deBnryXeHDGSsfV5BrnNBsqDP3UZD850uEvXYJF8OFzssoUf7xDVidw8h xw/1jKfn+646twd3jRALufmp6P0veWJQpvxih0/JRtobc2Ou0IzOEhGQhhJwYlltB7 XuihoGRLeES1itT7c+csI8BJ3nvzTaoe3wUGrF7U= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Moni Shoua , Saeed Mahameed , linux-netdev Subject: [PATCH mlx5-next 2/2] net/mlx5: Factor out HCA capabilities functions Date: Mon, 11 Feb 2019 13:56:08 +0200 Message-Id: <20190211115608.22677-3-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211115608.22677-1-leon@kernel.org> References: <20190211115608.22677-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky Combine all HCA capabilities setters under one function and compile out the ODP related function in case kernel was compiled without ODP support. Signed-off-by: Leon Romanovsky --- .../net/ethernet/mellanox/mlx5/core/main.c | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 6d45518edbdc..d7145ab6105d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -459,6 +459,7 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev) return err; } +#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING static int handle_hca_cap_odp(struct mlx5_core_dev *dev) { void *set_hca_cap; @@ -502,6 +503,7 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev) kfree(set_ctx); return err; } +#endif static int handle_hca_cap(struct mlx5_core_dev *dev) { @@ -576,6 +578,35 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) return err; } +static int set_hca_cap(struct mlx5_core_dev *dev) +{ + struct pci_dev *pdev = dev->pdev; + int err; + + err = handle_hca_cap(dev); + if (err) { + dev_err(&pdev->dev, "handle_hca_cap failed\n"); + goto out; + } + + err = handle_hca_cap_atomic(dev); + if (err) { + dev_err(&pdev->dev, "handle_hca_cap_atomic failed\n"); + goto out; + } + +#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING + err = handle_hca_cap_odp(dev); + if (err) { + dev_err(&pdev->dev, "handle_hca_cap_odp failed\n"); + goto out; + } +#endif + +out: + return err; +} + static int set_hca_ctrl(struct mlx5_core_dev *dev) { struct mlx5_reg_host_endianness he_in; @@ -963,21 +994,9 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, goto reclaim_boot_pages; } - err = handle_hca_cap(dev); + err = set_hca_cap(dev); if (err) { - dev_err(&pdev->dev, "handle_hca_cap failed\n"); - goto reclaim_boot_pages; - } - - err = handle_hca_cap_atomic(dev); - if (err) { - dev_err(&pdev->dev, "handle_hca_cap_atomic failed\n"); - goto reclaim_boot_pages; - } - - err = handle_hca_cap_odp(dev); - if (err) { - dev_err(&pdev->dev, "handle_hca_cap_odp failed\n"); + dev_err(&pdev->dev, "set_hca_cap failed\n"); goto reclaim_boot_pages; } -- 2.19.1