From 644504f2070f6bd52a468e5d9210a7accd89ea7a Mon Sep 17 00:00:00 2001 From: ftillier Date: Thu, 30 Mar 2006 18:27:03 +0000 Subject: [PATCH] [MT23108] Removed linker dependency on IBAL. git-svn-id: svn://openib.tc.cornell.edu/gen1@263 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/hw/mt23108/kernel/SOURCES | 1 - trunk/hw/mt23108/kernel/hca_mcast.c | 4 +-- trunk/hw/mt23108/kernel/hca_memory.c | 20 +++++++------- trunk/hw/mt23108/kernel/hca_smp.c | 2 +- trunk/hw/mt23108/kernel/hca_verbs.c | 40 ++++++++++++++-------------- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/trunk/hw/mt23108/kernel/SOURCES b/trunk/hw/mt23108/kernel/SOURCES index 8d8ff443..cdef4833 100644 --- a/trunk/hw/mt23108/kernel/SOURCES +++ b/trunk/hw/mt23108/kernel/SOURCES @@ -52,7 +52,6 @@ C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__MSC__ \ TARGETLIBS= \ $(TARGETPATH)\*\complib.lib \ - $(TARGETPATH)\*\ibal.lib \ $(TARGETPATH)\*\mt23108.lib \ $(DDK_LIB_PATH)\wdmguid.lib diff --git a/trunk/hw/mt23108/kernel/hca_mcast.c b/trunk/hw/mt23108/kernel/hca_mcast.c index 591a3f3c..49690f2c 100644 --- a/trunk/hw/mt23108/kernel/hca_mcast.c +++ b/trunk/hw/mt23108/kernel/hca_mcast.c @@ -125,7 +125,7 @@ cleanup: p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -189,7 +189,7 @@ cleanup: cl_free( mcast_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } diff --git a/trunk/hw/mt23108/kernel/hca_memory.c b/trunk/hw/mt23108/kernel/hca_memory.c index ddd4549a..f20ed9a8 100644 --- a/trunk/hw/mt23108/kernel/hca_memory.c +++ b/trunk/hw/mt23108/kernel/hca_memory.c @@ -121,7 +121,7 @@ cleanup: cl_free( mro_p); } CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("file %s line %d\n", __FILE__, __LINE__)); - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -227,7 +227,7 @@ cleanup: mro_p->mark = E_MARK_INVALID; cl_free( mro_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -284,7 +284,7 @@ mlnx_query_mr ( return IB_SUCCESS; cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -399,7 +399,7 @@ mlnx_modify_mr ( return IB_SUCCESS; cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -510,7 +510,7 @@ cleanup: if( mr_props.tpt.tpt.buf_lst.phys_buf_lst ) cl_free( mr_props.tpt.tpt.buf_lst.phys_buf_lst ); - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -621,7 +621,7 @@ cleanup: new_mro_p->mark = E_MARK_INVALID; cl_free( new_mro_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -686,7 +686,7 @@ cleanup: mro_p->mark = E_MARK_INVALID; cl_free( mro_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -769,7 +769,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -831,7 +831,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -894,7 +894,7 @@ cleanup: mwo_p->mark = E_MARK_INVALID; cl_free( mwo_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } diff --git a/trunk/hw/mt23108/kernel/hca_smp.c b/trunk/hw/mt23108/kernel/hca_smp.c index 5cefaae8..f768b5c2 100644 --- a/trunk/hw/mt23108/kernel/hca_smp.c +++ b/trunk/hw/mt23108/kernel/hca_smp.c @@ -552,7 +552,7 @@ mlnx_local_mad ( return IB_SUCCESS; cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } diff --git a/trunk/hw/mt23108/kernel/hca_verbs.c b/trunk/hw/mt23108/kernel/hca_verbs.c index ca9ce406..6e95a8f9 100644 --- a/trunk/hw/mt23108/kernel/hca_verbs.c +++ b/trunk/hw/mt23108/kernel/hca_verbs.c @@ -166,7 +166,7 @@ cleanup: mlnx_hobs_remove(new_ca); // For user mode call - return status to user mode - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -369,7 +369,7 @@ cleanup: if (hca_ul_resources_p) cl_free (hca_ul_resources_p); if (hca_ports) cl_free( hca_ports); if( p_ca_attr != NULL || status != IB_INSUFFICIENT_MEMORY ) - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -435,7 +435,7 @@ mlnx_modify_ca ( return IB_SUCCESS; cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -486,7 +486,7 @@ mlnx_close_ca ( return IB_SUCCESS; cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -801,7 +801,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -882,7 +882,7 @@ cleanup_locked: cl_mutex_release(&hobul_p->pd_info_tbl[pd_idx].mutex); cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -966,7 +966,7 @@ cleanup: p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1026,7 +1026,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1077,7 +1077,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1129,7 +1129,7 @@ cleanup: avo_p->mark = E_MARK_INVALID; cl_free( avo_p); } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1363,7 +1363,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1602,7 +1602,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1717,7 +1717,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1785,7 +1785,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -1823,7 +1823,7 @@ mlnx_destroy_qp ( VALIDATE_INDEX(qp_idx, hobul_p->max_qp, IB_INVALID_QP_HANDLE, cleanup); if ( E_MARK_QP != hobul_p->qp_info_tbl[qp_idx].mark) { if (E_MARK_INVALID == hobul_p->qp_info_tbl[qp_idx].mark) { - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(IB_INVALID_QP_HANDLE))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status IB_INVALID_QP_HANDLE\n")); return IB_SUCCESS; // Already freed } status = IB_INVALID_QP_HANDLE; @@ -1892,7 +1892,7 @@ mlnx_destroy_qp ( cleanup_locked: cl_mutex_release(&hobul_p->qp_info_tbl[qp_idx].mutex); cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -2036,7 +2036,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -2136,7 +2136,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -2205,7 +2205,7 @@ cleanup: p_umv_buf->output_size = 0; p_umv_buf->status = status; } - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } @@ -2280,7 +2280,7 @@ cleanup_locked: cl_mutex_release(&hobul_p->cq_info_tbl[cq_idx].mutex); cleanup: - CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %s\n", ib_get_err_str(status))); + CL_TRACE(CL_DBG_ERROR, g_mlnx_dbg_lvl, ("completes with ERROR status %d\n", status)); CL_EXIT(MLNX_DBG_TRACE, g_mlnx_dbg_lvl); return status; } -- 2.41.0