On Wed, Sep 27, 2017 at 08:33:38PM +0000, Kalderon, Michal wrote:
> From: Leon Romanovsky <leon@xxxxxxxxxx>
> Sent: Wednesday, September 27, 2017 7:56 PM
> On Wed, Sep 27, 2017 at 07:53:39PM +0300, Leon Romanovsky wrote:
> >> On Wed, Sep 27, 2017 at 04:18:50PM +0000, Kalderon, Michal wrote:
> >> > From: Doug Ledford <dledford@xxxxxxxxxx>
> >> > Sent: Wednesday, September 27, 2017 4:27 PM
> >> >
> >> > >On Wed, 2017-09-20 at 08:39 +0300, Michal Kalderon wrote:
> >> > >> Initialize the rdma_type (iWARP or RoCE) which is set according to
> >> > >> device configuration in qed.
> >> > >>
> >> > >> Fixes: e6a38c54faf ("RDMA/qedr: Add support for registering an iWARP
> >> > >> device")
> >> > >>
> >> > >> Signed-off-by: Michal Kalderon <Michal.Kalderon@xxxxxxxxxx>
> >> > >> Signed-off-by: Ariel Elior <Ariel.Elior@xxxxxxxxxx>
> >> > >>
> >> > >> ---
> >> > >> This patch applies cleanly on k.o/for-next-merged
> >> > >>
> >> > >> Changes from V0:
> >> > >> - Added Fixes in commit comment.
> >> > >
> >> > >Sorry, I was wrong in my email to the previous posting of this patch.
> >> > >I had pulled this v1 patch from patchworks, not the original patch, and
> >> > >so the Fixes: line was yours. Patchworks did not add the Fixes: line
> >> > >to the v0 patch when I downloaded it just now.
> >> >
> >> > >That being said, I still can't build with this patch ;-)
> >> > Are you building against the rdma-next branch ?
> >> > The patch requires the iWARP series, originally this was tested against for-next-merged,
> >> > what's the error you're getting ?
> >>
> >> On rdma-next:
> >> drivers/infiniband/hw/qedr/main.c: In function ‘qedr_add’:
> >> drivers/infiniband/hw/qedr/main.c:780:7: error: ‘struct qedr_dev’ has no member named ‘rdma_type’; did you mean ‘rdma_ctx’?
> >> dev->rdma_type = dev_info.rdma_type;
> >> ^~~~~~~~~
> >> rdma_ctx
> >> make[4]: *** [scripts/Makefile.build:311: drivers/infiniband/hw/qedr/main.o] Error 1
> >
> >My config:
> >
> >➜ linux-rdma git:(rdma-next) grep QED .config
> >CONFIG_QED=m
> >CONFIG_QED_LL2=y
> >CONFIG_QED_SRIOV=y
> >CONFIG_QEDE=m
> >CONFIG_QED_RDMA=y
> >CONFIG_INFINIBAND_QEDR=m
>
> Thanks Leon for helping out with this. Unfortunately i'm not seeing this.
> The rdma_type field was added with the following patch:
> https://kernel.googlesource.com/pub/scm/linux/kernel/git/dledford/rdma/+/e6a38c54faf38498170e227c82ea25cb8bc1ae71
>
> When running git log on the k.o/for-next I see the patch (last in list below),
> applying this patch on top of rdma-next works for me and compiles cleanly.
>
> 2e2f2d0 RDMA/qedr: Fix rdma_type initialization
> 1848757 Merge branches 'hns' and 'misc' into k.o/for-next
> 931bc0d IB: Move PCI dependency from root KConfig to HW's KConfigs
> 7ae6f2a Merge branch 'qedr' into k.o/for-next
> bd491d2 RDMA/qedr: fix build error without ipv6
> 89fd257 RDMA/qedr: Missing error code in qedr_init_user_queue()
> 847cb1a RDMA/qedr: fix spelling mistake: "invlaid" -> "invalid"
> 69ad0e7 RDMA/qedr: Add support for iWARP in user space
> e411e05 RDMA/qedr: Add iWARP connection management functions
> de0089e RDMA/qedr: Add iWARP connection management qp related callbacks
> fb1a22b RDMA/qedr: Add support for read with invalidate, supported in iWARP
> f5b1b17 RDMA/qedr: Add iWARP support in existing verbs
> e6a38c5 RDMA/qedr: Add support for registering an iWARP device
>
> am i missing something ?
I refreshed my branches now and it worked, but your git log history
looks strange. Where did you see the commit 1848757 and 931bc0d?
https://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git/log/?h=k.o/for-next
Age Commit message (Expand) Author Files Lines
3 days Merge branch 'qedr' into k.o/for-nextfor-nextk.o/for-next Doug Ledford 11 -91/+1208
3 days Merge tag 'v4.14-rc2' into k.o/for-next Doug Ledford 12044 -388475/+631018
3 days Linux 4.14-rc2HEADmaster Linus Torvalds 1 -1/+1
➜ linux-rdma git:(iwarp-compile) git log --oneline
f3506957237b (HEAD -> iwarp-compile) RDMA/qedr: Fix rdma_type initialization
7ae6f2a3d552 (rdma/k.o/for-next, grdma/k.o/for-next) Merge branch 'qedr' into k.o/for-next
0d9c2ff1c9f7 Merge tag 'v4.14-rc2' into k.o/for-next
e19b205be43d (tag: v4.14-rc2, rdma/master, origin/master, ml/master, grdma/master, grdma/hns, backup/master, master) Linux 4.14-rc2
Thanks
> thanks,
> Michal
>
Attachment:
signature.asc
Description: PGP signature
