[openib-general] svn status?
Eitan Rabin
Mon Apr 19 07:01:04 PDT 2004
Roland,
This is work in progress. I was unable to continue due to problem that we
had with SVN.
Please don't do the check-ins on the driver part of the SVN; I wouldn't like
to have merges at these early stages of the check-in.
Matt, do we have nightly back-ups of the SVN. After what happen last week I
think we should have this in place.
Eitan
-----Original Message-----
From: Roland Dreier [mailto:roland at topspin.com]
Sent: Sunday, April 18, 2004 1:36 PM
To: openib-general at openib.org
Subject: Re: [openib-general] svn status?
Importance: High
Eitan, I see that you checked in a lot of the Mellanox HCA driver
code. It looks like the Makefiles got broken, and also important
fixes for kernel 2.6 with CONFIG_REGPARM got dropped. I'm including
patches in this email.
Should I go ahead and check in these changes?
Also, once you have the build system for userspace checked in, I think
you will have a lot of "warning: dereferencing type-punned pointer
will break strict-aliasing rules" with gcc 3.3, since none of my fixes
seem to be included. I can provide patches once we have userspace
Makefiles checked in.
If you want I can provide patches for these also:
drivers/infiniband/hw/mellanox-hca/mosal/mt_bufpool.c:131: warning: use
of cast expressions as lvalues is deprecated
drivers/infiniband/hw/mellanox-hca/vapi/thhul_cqm.c:1441: warning: use
of cast expressions as lvalues is deprecated
drivers/infiniband/hw/mellanox-hca/vapi/thhul_cqm.c:1455: warning: use
of cast expressions as lvalues is deprecated
- Roland
Here are the Makefile fixes:
Index: src/linux-kernel/infiniband/hw/mellanox-hca/vapi/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/vapi/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/vapi/Makefile.26
(working copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=drivers/infiniband
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/hh/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/hh/Makefile.26 (revision
65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/hh/Makefile.26 (working
copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=drivers/infiniband/include
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/thh/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/thh/Makefile.26 (revision
65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/thh/Makefile.26 (working
copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=driver/infiniband
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/mpga/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/mpga/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/mpga/Makefile.26
(working copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=drivers/infiniband
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/vipkl/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/vipkl/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/vipkl/Makefile.26
(working copy)
@@ -1,6 +1,5 @@
-IB_SRC_DIR=drivers/infiniband
+IB_SRC_DIR ?= drivers/infiniband
-
EXTRA_CFLAGS += \
-I$(src) \
-I$(IB_SRC_DIR)/include \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/vapi_common/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/vapi_common/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/vapi_common/Makefile.26
(working copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR=drivers/infiniband
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/provider/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/provider/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/provider/Makefile.26
(working copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=drivers/infiniband
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(IB_SRC_DIR)/include \
Index: src/linux-kernel/infiniband/hw/mellanox-hca/mosal/Makefile.26
===================================================================
--- src/linux-kernel/infiniband/hw/mellanox-hca/mosal/Makefile.26
(revision 65)
+++ src/linux-kernel/infiniband/hw/mellanox-hca/mosal/Makefile.26
(working copy)
@@ -1,4 +1,4 @@
-IB_SRC_DIR?=drivers/infiniband/include
+IB_SRC_DIR ?= drivers/infiniband
EXTRA_CFLAGS += \
-I$(src) \
And here are the CONFIG_REGPARM fixes:
Index: src/common/hw/mellanox-hca/mlxsys/mosal/os_dep/linux/mosal_mlock.c
===================================================================
--- src/common/hw/mellanox-hca/mlxsys/mosal/os_dep/linux/mosal_mlock.c
(revision 65)
+++ src/common/hw/mellanox-hca/mlxsys/mosal/os_dep/linux/mosal_mlock.c
(working copy)
@@ -99,7 +99,7 @@
#endif
/* type to hold the sys_mlock and sys_munlock pointers */
-typedef long (*sys_lock_ptr_t)(unsigned long, size_t);
+typedef asmlinkage long (*sys_lock_ptr_t)(unsigned long, size_t);
static sys_lock_ptr_t mlock_ptr, munlock_ptr;
Index: src/common/hw/mellanox-hca/HCA/vip/os_dep/linux/vipkl_mod_obj.c
===================================================================
--- src/common/hw/mellanox-hca/HCA/vip/os_dep/linux/vipkl_mod_obj.c
(revision 65)
+++ src/common/hw/mellanox-hca/HCA/vip/os_dep/linux/vipkl_mod_obj.c
(working copy)
@@ -42,7 +42,7 @@
int vipkl_dev_major_num=0;
static m_file_op_t vipkl_file_ops;
MODULE_PARM(vipkl_dev_major_num,"i");
-asmlinkage VIP_ret_t VIPKL_ioctl(VIPKL_ops_t ops,VIP_hca_state_t*
rsct_arr,void *pi, u_int32_t isz, void *po,
+VIP_ret_t VIPKL_ioctl(VIPKL_ops_t ops,VIP_hca_state_t* rsct_arr,void *pi,
u_int32_t isz, void *po,
u_int32_t osz, u_int32_t* bs_p );
--
To unsubscribe send an email with subject unsubscribe to
openib-general at openib.org.
Please contact moderator at openib.org for questions.
--
To unsubscribe send an email with subject unsubscribe to openib-general at openib.org.
Please contact moderator at openib.org for questions.
More information about the openib-general mailing list