linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sagi Grimberg <sagig-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
To: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: merge struct ib_device_attr into struct ib_device V2
Date: Mon, 12 Oct 2015 12:26:06 +0300	[thread overview]
Message-ID: <561B7CAE.3040505@dev.mellanox.co.il> (raw)
In-Reply-To: <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>

On 10/12/2015 9:57 AM, Christoph Hellwig wrote:
> This patch gets rid of struct ib_device_attr and cleans up drivers nicely.
>
> It goes on top of my send_wr cleanups and the memory registration udpates
> from Sagi.
>
> Changes since V1:
>   - rebased on top of the Sagi's latest reg_api.6 branch
>

Christoph,

First go with this looks OK for mlx4. mlx5 needs the below incremental
patch to be folded in.

we need dev->ib_dev.max_pkeys set when get_port_caps() is called.

--
diff --git a/drivers/infiniband/hw/mlx5/main.c 
b/drivers/infiniband/hw/mlx5/main.c
index 67b979f..5b73322 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1321,6 +1321,10 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

         dev->mdev = mdev;

+       err = mlx5_ib_init_device_flags(&dev->ib_dev);
+       if (err)
+               goto err_dealloc;
+
         err = get_port_caps(dev);
         if (err)
                 goto err_dealloc;
@@ -1433,10 +1437,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         if (err)
                 goto err_rsrc;

-       err = mlx5_ib_init_device_flags(&dev->ib_dev);
-       if (err)
-               goto err_rsrc;
-
         err = ib_register_device(&dev->ib_dev, NULL);
         if (err)
                 goto err_odp;
--
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2015-10-12  9:26 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12  6:57 merge struct ib_device_attr into struct ib_device V2 Christoph Hellwig
     [not found] ` <1444633078-27166-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2015-10-12  6:57   ` [PATCH] IB: merge struct ib_device_attr into struct ib_device Christoph Hellwig
2015-10-12  9:26   ` Sagi Grimberg [this message]
     [not found]     ` <561B7CAE.3040505-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-12 14:42       ` merge struct ib_device_attr into struct ib_device V2 Christoph Hellwig
     [not found]         ` <20151012144212.GB24770-jcswGhMUV9g@public.gmane.org>
2015-10-20 12:00           ` Sagi Grimberg
     [not found]             ` <56262CF9.1040509-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 12:53               ` Or Gerlitz
     [not found]                 ` <CAJ3xEMhEE=Qp=LcYQYJB3rjfhdgd28QG_ZXbpFUCUubGD2uAGQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 13:08                   ` Sagi Grimberg
     [not found]                     ` <56263CE6.5010005-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 13:22                       ` Christoph Hellwig
2015-10-20 14:08                       ` Or Gerlitz
     [not found]                         ` <CAJ3xEMjmfNmiTiNctobN=BKvwB-oaMZtBxdqL5zVyvvG_M1KiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 15:00                           ` Sagi Grimberg
     [not found]                             ` <56265702.1030209-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 15:07                               ` Or Gerlitz
     [not found]                                 ` <CAJ3xEMh12RjU9ws3r5djigHdkMGnT35+uouRAMzGxj2jhmgKFA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-20 15:13                                   ` Sagi Grimberg
     [not found]                                     ` <56265A1F.6090204-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-10-20 15:39                                       ` Or Gerlitz
2015-10-21  6:40                                       ` Christoph Hellwig
2015-10-21  6:38                                   ` Christoph Hellwig
     [not found]                                     ` <20151021063830.GA19027-jcswGhMUV9g@public.gmane.org>
2015-10-21  6:44                                       ` Or Gerlitz
     [not found]                                         ` <56273459.6050007-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21  6:51                                           ` Christoph Hellwig
     [not found]                                             ` <20151021065134.GA19210-jcswGhMUV9g@public.gmane.org>
2015-10-21  7:11                                               ` Or Gerlitz
     [not found]                                                 ` <56273AA1.6060607-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21  7:33                                                   ` Christoph Hellwig
     [not found]                                                     ` <20151021073338.GA19626-jcswGhMUV9g@public.gmane.org>
2015-10-21  7:41                                                       ` Or Gerlitz
     [not found]                                                         ` <56274199.1030800-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2015-10-21  7:43                                                           ` Christoph Hellwig
2015-10-21 15:48                                                   ` Bart Van Assche
     [not found]                                                     ` <5627B3BA.7060700-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2015-10-21 16:43                                                       ` Jason Gunthorpe
     [not found]                                                         ` <20151021164356.GA17666-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-10-21 17:21                                                           ` Steve Wise
2015-10-21 18:08                                                       ` Or Gerlitz
     [not found]                                                         ` <CAJ3xEMh3pE61sNaZKBr8k47Lb52cUc=n4JToXvvKyrTTu3WW2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-21 18:20                                                           ` Jason Gunthorpe
     [not found]                                                             ` <20151021182019.GB15771-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2015-10-21 18:50                                                               ` Or Gerlitz
2015-10-27 13:40   ` Sagi Grimberg

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=561B7CAE.3040505@dev.mellanox.co.il \
    --to=sagig-ldsdmyg8hgv8yrgs2mwiifqbs+8scbdb@public.gmane.org \
    --cc=hch-jcswGhMUV9g@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /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).