[openib-general] EHCA-0028 userspace build fails with openib svn 3774

[Troy Benjegerdes]

On Thu, Oct 20, 2005 at 08:46:12AM +0200, Heiko J Schick wrote:
> Hello Troy,
> 
> this problem should be solved in EHCA2_0033. The EHCA2_0028 package was
> only tested with OpenIB trunk 3615. The problem is EHCA_0028 doesn't
> included the raw_fw_ver pointer for ibv_cmd_query_device.
> 
> Please use EHCA2_0033 available via:
> 1: https://openib.org/svn/gen2/trunk/src/userspace/libehca/
> 2: http://prdownloads.sourceforge.net/ibmehcad/ehca2_EHCA2_0033.tgz?download
> 
> We've included yesterday EHCA2_0033 into the OpenIB tree.

A couple of nits..

infiniband/hw/ehca/Makefile doesn't fit 80 columns very well.

I also see a bunch of warnings about:

drivers/infiniband/hw/ehca/./hcp_if.h:1823: warning: ISO C90 forbids
mixed declarations and code

I need the following patches to build. However, I appear to be unable to
unload the previous 0028 hcad_mod, so I think I'm going to have to
reboot to actually test it.

Index: infiniband/Kconfig
===================================================================
--- infiniband/Kconfig  (revision 3828)
+++ infiniband/Kconfig  (working copy)
@@ -32,6 +32,8 @@

 source "drivers/infiniband/hw/mthca/Kconfig"

+source "drivers/infiniband/hw/ehca/Kconfig"
+
 source "drivers/infiniband/ulp/ipoib/Kconfig"

 source "drivers/infiniband/ulp/sdp/Kconfig"
Index: infiniband/Makefile
===================================================================
--- infiniband/Makefile (revision 3828)
+++ infiniband/Makefile (working copy)
@@ -1,6 +1,7 @@
 obj-$(CONFIG_INFINIBAND)               += core/
 obj-$(CONFIG_IPATH_CORE)               += hw/ipath/
 obj-$(CONFIG_INFINIBAND_MTHCA)         += hw/mthca/
+obj-$(CONFIG_INFINIBAND_EHCA)           += hw/ehca/
 obj-$(CONFIG_INFINIBAND_IPOIB)         += ulp/ipoib/
 obj-$(CONFIG_INFINIBAND_SDP)           += ulp/sdp/
 obj-$(CONFIG_INFINIBAND_SRP)           += ulp/srp/
Index: infiniband/hw/ehca/Makefile
===================================================================
--- infiniband/hw/ehca/Makefile (revision 3828)
+++ infiniband/hw/ehca/Makefile (working copy)
@@ -37,15 +37,6 @@
 #  $Id: Makefile.kernel_prod,v 1.13 2005/10/13 15:01:16 schickhj Exp $
 #

-
-
-#make for kernel 2.6 build
-
-ifndef GEN2_PATH_KERNEL
-GEN2_PATH_KERNEL = /home/source/trunk_3745/src/linux-kernel
-endif
-# GEN2_PATH_KERNEL = drivers #for gen2 code in kernel
-
 obj-m += hcad_mod.o

 hcad_mod-objs = ehca_main.o ehca_hca.o ipz_pt_fn.o ehca_classes.o
ehca_av.o \
@@ -60,7 +51,6 @@

 EXTRA_CFLAGS +=-DP_SERIES -DEHCA_USE_HCALL -DEHCA_USE_HCALL_KERNEL \
        -I$(src)/.  \
-       -I$(GEN2_PATH_KERNEL)/infiniband/include/rdma \
-       -I$(GEN2_PATH_KERNEL)/infiniband/core
+       -Idrivers/infiniband/include