From: Jason Gunthorpe <jgg@mellanox.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: Doug Ledford <dledford@redhat.com>,
Leon Romanovsky <leonro@mellanox.com>,
RDMA mailing list <linux-rdma@vger.kernel.org>,
Moni Shoua <monis@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
linux-netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH mlx5-next 2/2] net/mlx5: Factor out HCA capabilities functions
Date: Mon, 11 Feb 2019 19:50:55 +0000 [thread overview]
Message-ID: <20190211195050.GL24706@mellanox.com> (raw)
In-Reply-To: <20190211115608.22677-3-leon@kernel.org>
On Mon, Feb 11, 2019 at 01:56:08PM +0200, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> 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 <leonro@mellanox.com>
> .../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
> +++ 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
Adding
if (IS_ENABLED..)
return 0;
To the top of handle_hca_cap_odp is alot better.
Jason
next prev parent reply other threads:[~2019-02-11 19:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 11:56 [PATCH rdma-next 0/2] Followup changes to mlx5-next branch Leon Romanovsky
2019-02-11 11:56 ` [PATCH mlx5-next 1/2] net/mlx5: Align ODP capability function with netdev coding style Leon Romanovsky
2019-02-11 11:56 ` [PATCH mlx5-next 2/2] net/mlx5: Factor out HCA capabilities functions Leon Romanovsky
2019-02-11 19:50 ` Jason Gunthorpe [this message]
2019-02-11 20:02 ` Leon Romanovsky
2019-02-11 20:32 ` Jason Gunthorpe
2019-02-11 22:52 ` Saeed Mahameed
2019-02-13 17:53 ` [PATCH rdma-next 0/2] Followup changes to mlx5-next branch Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190211195050.GL24706@mellanox.com \
--to=jgg@mellanox.com \
--cc=dledford@redhat.com \
--cc=leon@kernel.org \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=monis@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).