[GIT PULL] please pull infiniband.git

[GIT PULL] please pull infiniband.git

[Roland Dreier]

Linus, please pull from

    master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This tree is also available from kernel.org mirrors at:

    git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This will get the last batch of InfiniBand/RDMA merges for 2.6.25,
mostly preparation for enabling stateless offloads for IP-over-InfiniBand.

Eli Cohen (3):
      IPoIB: Add high DMA feature flag
      IPoIB: Add send gather support
      IB/core: Add IP checksum offload support

Jack Morgenstein (2):
      mlx4_core: For 64-bit systems, vmap() kernel queue buffers
      IB/mlx4: Use multiple WQ blocks to post smaller send WQEs

Roland Dreier (3):
      IB/mlx4: Consolidate code to get an entry from a struct mlx4_buf
      mlx4_core: Clean up struct mlx4_buf
      IB/core: Remove unused struct ib_device.flags member

 drivers/infiniband/hw/mlx4/cq.c            |   20 ++--
 drivers/infiniband/hw/mlx4/mlx4_ib.h       |    2 +
 drivers/infiniband/hw/mlx4/qp.c            |  216 +++++++++++++++++++++++-----
 drivers/infiniband/hw/mlx4/srq.c           |    8 +-
 drivers/infiniband/ulp/ipoib/ipoib.h       |    4 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c    |   10 +-
 drivers/infiniband/ulp/ipoib/ipoib_ib.c    |   89 +++++++++---
 drivers/infiniband/ulp/ipoib/ipoib_main.c  |    4 +-
 drivers/infiniband/ulp/ipoib/ipoib_verbs.c |   10 +-
 drivers/net/mlx4/alloc.c                   |   48 ++++--
 drivers/net/mlx4/mr.c                      |    4 +-
 include/linux/mlx4/device.h                |   19 ++-
 include/linux/mlx4/qp.h                    |    4 +
 include/rdma/ib_verbs.h                    |   16 ++-
 14 files changed, 342 insertions(+), 112 deletions(-)

[PATCH] mlx4: fix build break

[Olof Johansson]

On Fri, Feb 08, 2008 at 03:16:53PM -0800, Roland Dreier wrote:

>       mlx4_core: For 64-bit systems, vmap() kernel queue buffers

Hi,

The above patch caused this to pop up on powerpc allyesconfig, looks
like a missing include file:

drivers/net/mlx4/alloc.c: In function 'mlx4_buf_alloc':
drivers/net/mlx4/alloc.c:162: error: implicit declaration of function 'vmap'
drivers/net/mlx4/alloc.c:162: error: 'VM_MAP' undeclared (first use in this function)
drivers/net/mlx4/alloc.c:162: error: (Each undeclared identifier is reported only once
drivers/net/mlx4/alloc.c:162: error: for each function it appears in.)
drivers/net/mlx4/alloc.c:162: warning: assignment makes pointer from integer without a cast
drivers/net/mlx4/alloc.c: In function 'mlx4_buf_free':
drivers/net/mlx4/alloc.c:187: error: implicit declaration of function 'vunmap'

Signed-off-by: Olof Johansson <olof@lixom.net>


diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index 521dc03..75ef9d0 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/bitmap.h>
 #include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
 
 #include "mlx4.h"
 

Re: [PATCH] mlx4: fix build break

[Roland Dreier]

Thanks, applied.

Jack, I thought you guys tested the build on powerpc.  How did this
sneak through?

Re: [ofa-general] Re: [PATCH] mlx4: fix build break

[Tziporet Koren]

Roland Dreier wrote:
> Thanks, applied.
>
> Jack, I thought you guys tested the build on powerpc.  How did this
> sneak through?
>
>   
We OFED on PPC - not clear how this happened
We will check our process again

Tziporet

Re: [PATCH] mlx4: fix build break

[Jack Morgenstein]

On Tuesday 12 February 2008 00:18, Roland Dreier wrote:
> Thanks, applied.
> 
> Jack, I thought you guys tested the build on powerpc.  How did this
> sneak through?
> 
It did not sneak through, because the problem does not exist in the OFED git.

The following commit was performed to
 git://git.openfabrics.org/ofed_1_3/linux-2.6.git
on Sept 25, 2007:
=======================================
commit 4a5709b81dfd249c98271801ddc01decb7acd466
Author: Eli Cohen <eli@mellanox.co.il>
Date:   Tue Sep 25 12:41:30 2007 +0200

    add missing include file. ia64 requires it.

    Signed-off-by: Eli Cohen <eli@mellanox.co.il>

diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index f8d63d3..704a56b 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/bitmap.h>
 #include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>

 #include "mlx4.h"
========================================

I guess this just fell through the cracks with regard to posting it to the list.
Sorry about that.

- Jack