From f935e28ae26fcf1dc1cfead9f588ef4e76076c7e Mon Sep 17 00:00:00 2001 From: tzachid Date: Wed, 9 Jul 2008 07:24:53 +0000 Subject: [PATCH] [mlx4] Fix WPP for mlx4 part one git-svn-id: svn://openib.tc.cornell.edu/gen1@1352 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/hw/mlx4/kernel/bus/core/SOURCES | 2 +- trunk/hw/mlx4/kernel/bus/core/iobuf.c | 1 + trunk/hw/mlx4/kernel/bus/core/l2w_umem.c | 2 +- trunk/hw/mlx4/kernel/bus/core/pa_cash.c | 2 +- trunk/hw/mlx4/kernel/bus/ib/cq.c | 2 +- trunk/hw/mlx4/kernel/bus/ib/mad.c | 1 + trunk/hw/mlx4/kernel/bus/net/mlx4.h | 1 + trunk/hw/mlx4/kernel/hca/SOURCES | 2 +- trunk/hw/mlx4/kernel/hca/drv.c | 9 +++++---- trunk/hw/mlx4/kernel/hca/fw.c | 2 +- trunk/hw/mlx4/kernel/hca/verbs.c | 2 -- trunk/hw/mlx4/kernel/inc/l2w.h | 1 - trunk/hw/mlx4/kernel/inc/mlx4_debug.h | 10 +++++++--- 13 files changed, 21 insertions(+), 16 deletions(-) diff --git a/trunk/hw/mlx4/kernel/bus/core/SOURCES b/trunk/hw/mlx4/kernel/bus/core/SOURCES index 8fb339b6..d138a00a 100644 --- a/trunk/hw/mlx4/kernel/bus/core/SOURCES +++ b/trunk/hw/mlx4/kernel/bus/core/SOURCES @@ -43,7 +43,7 @@ TARGETLIBS= \ C_DEFINES = $(C_DEFINES) -DEVENT_TRACING RUN_WPP = $(SOURCES) -km -ext: .c .h .C .H \ - -scan:..\inc\mlx4_debug.h \ + -scan:..\..\inc\mlx4_debug.h \ -func:MLX4_PRINT(LEVEL,FLAGS,(MSG,...)) \ -func:MLX4_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) !ENDIF diff --git a/trunk/hw/mlx4/kernel/bus/core/iobuf.c b/trunk/hw/mlx4/kernel/bus/core/iobuf.c index bc39763d..606eb963 100644 --- a/trunk/hw/mlx4/kernel/bus/core/iobuf.c +++ b/trunk/hw/mlx4/kernel/bus/core/iobuf.c @@ -33,6 +33,7 @@ * * $Id: mt_memory.c 2020 2007-05-01 09:29:10Z leonid $ */ +#include #include "l2w.h" #include "pa_cash.h" #include "ib_verbs.h" diff --git a/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c b/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c index e2906ef1..5a3d3078 100644 --- a/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c +++ b/trunk/hw/mlx4/kernel/bus/core/l2w_umem.c @@ -1,4 +1,4 @@ - +#include #include "l2w.h" #include "ib_verbs.h" diff --git a/trunk/hw/mlx4/kernel/bus/core/pa_cash.c b/trunk/hw/mlx4/kernel/bus/core/pa_cash.c index b6826457..e663b755 100644 --- a/trunk/hw/mlx4/kernel/bus/core/pa_cash.c +++ b/trunk/hw/mlx4/kernel/bus/core/pa_cash.c @@ -32,7 +32,7 @@ * * $Id: mlnx_uvp_cq.c 1611 2006-08-20 14:48:55Z sleybo $ */ - +#include #include "l2w.h" #include "pa_cash.h" diff --git a/trunk/hw/mlx4/kernel/bus/ib/cq.c b/trunk/hw/mlx4/kernel/bus/ib/cq.c index c24a1660..23985b36 100644 --- a/trunk/hw/mlx4/kernel/bus/ib/cq.c +++ b/trunk/hw/mlx4/kernel/bus/ib/cq.c @@ -29,7 +29,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - +#include #include "mlx4_ib.h" #include "cq.h" #include "qp.h" diff --git a/trunk/hw/mlx4/kernel/bus/ib/mad.c b/trunk/hw/mlx4/kernel/bus/ib/mad.c index b03c02b4..513b8da3 100644 --- a/trunk/hw/mlx4/kernel/bus/ib/mad.c +++ b/trunk/hw/mlx4/kernel/bus/ib/mad.c @@ -30,6 +30,7 @@ * SOFTWARE. */ +#include #include "mlx4_ib.h" #include #include diff --git a/trunk/hw/mlx4/kernel/bus/net/mlx4.h b/trunk/hw/mlx4/kernel/bus/net/mlx4.h index 4ea351c5..ea4035c7 100644 --- a/trunk/hw/mlx4/kernel/bus/net/mlx4.h +++ b/trunk/hw/mlx4/kernel/bus/net/mlx4.h @@ -37,6 +37,7 @@ #ifndef MLX4_H #define MLX4_H +#include #include "l2w.h" #include "device.h" #include "doorbell.h" diff --git a/trunk/hw/mlx4/kernel/hca/SOURCES b/trunk/hw/mlx4/kernel/hca/SOURCES index 2cc7fe73..575cdb71 100644 --- a/trunk/hw/mlx4/kernel/hca/SOURCES +++ b/trunk/hw/mlx4/kernel/hca/SOURCES @@ -3,7 +3,7 @@ TARGETPATH=..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR) TARGETTYPE=DRIVER !if $(FREEBUILD) -#ENABLE_EVENT_TRACING=1 +ENABLE_EVENT_TRACING=1 !else #ENABLE_EVENT_TRACING=1 !endif diff --git a/trunk/hw/mlx4/kernel/hca/drv.c b/trunk/hw/mlx4/kernel/hca/drv.c index 30cff3b6..6b14ece9 100644 --- a/trunk/hw/mlx4/kernel/hca/drv.c +++ b/trunk/hw/mlx4/kernel/hca/drv.c @@ -35,6 +35,9 @@ #include #if defined(EVENT_TRACING) +#ifdef offsetof +#undef offsetof +#endif #include "drv.tmh" #endif @@ -652,8 +655,7 @@ EvtDevicePrepareHardware( /* get node GUID */ err = __get_dev_info( p_fdo, &p_fdo->hca.guid, &p_fdo->hca.hw_ver ); - if (err) { - + if (err) { HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_LOW , ("can't get guid - ib_query_device() failed (%08X)\n", err )); //TODO: no cleanup on error @@ -1765,8 +1767,7 @@ hca_start( /* get node GUID */ err = __get_dev_info( p_fdo, &p_fdo->hca.guid, &p_fdo->hca.hw_ver ); - if (err) { - + if (err) { HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_LOW , ("can't get guid - ib_query_device() failed (%08X)\n", err )); //TODO: no cleanup on error diff --git a/trunk/hw/mlx4/kernel/hca/fw.c b/trunk/hw/mlx4/kernel/hca/fw.c index 515ebe98..470b3232 100644 --- a/trunk/hw/mlx4/kernel/hca/fw.c +++ b/trunk/hw/mlx4/kernel/hca/fw.c @@ -36,7 +36,7 @@ #ifdef offsetof #undef offsetof #endif -#include "vp.tmh" +#include "fw.tmh" #endif diff --git a/trunk/hw/mlx4/kernel/hca/verbs.c b/trunk/hw/mlx4/kernel/hca/verbs.c index 4993715c..e0ca2b41 100644 --- a/trunk/hw/mlx4/kernel/hca/verbs.c +++ b/trunk/hw/mlx4/kernel/hca/verbs.c @@ -242,7 +242,6 @@ int ib_destroy_cq(struct ib_cq *cq) // Queue pairs // -#if DBG static char *__print_qtype(enum ib_qp_type qtype) { char *str = NULL; @@ -258,7 +257,6 @@ static char *__print_qtype(enum ib_qp_type qtype) } return str; } -#endif struct ib_qp *ibv_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *qp_init_attr, diff --git a/trunk/hw/mlx4/kernel/inc/l2w.h b/trunk/hw/mlx4/kernel/inc/l2w.h index 22ac6c04..79beda2b 100644 --- a/trunk/hw/mlx4/kernel/inc/l2w.h +++ b/trunk/hw/mlx4/kernel/inc/l2w.h @@ -283,7 +283,6 @@ void core_cleanup(); struct mlx4_dev; struct mlx4_priv; -#include #include #include #include diff --git a/trunk/hw/mlx4/kernel/inc/mlx4_debug.h b/trunk/hw/mlx4/kernel/inc/mlx4_debug.h index c8982c62..0a2b7107 100644 --- a/trunk/hw/mlx4/kernel/inc/mlx4_debug.h +++ b/trunk/hw/mlx4/kernel/inc/mlx4_debug.h @@ -33,14 +33,18 @@ #ifndef _MLX4_DEBUG_H_ #define _MLX4_DEBUG_H_ +#include +#define NTSTRSAFE_LIB +#include + + #include "ev_log.h" -extern uint32_t g_mlx4_dbg_level; -extern uint32_t g_mlx4_dbg_flags; +extern unsigned int g_mlx4_dbg_level; +extern unsigned int g_mlx4_dbg_flags; #define MAX_LOG_BUF_LEN 512 extern WCHAR g_wlog_buf[ MAX_LOG_BUF_LEN ]; extern UCHAR g_slog_buf[ MAX_LOG_BUF_LEN ]; - static void _build_str( const char * format, ... ) { NTSTATUS status; -- 2.46.0