Fixed uDAPL issues with new CM

git-svn-id: svn://openib.tc.cornell.edu/gen1@18 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/fab_cm_branch/core/al/kernel/SOURCES b/branches/fab_cm_branch/core/al/kernel/SOURCES
index 711167a97043d04bb04467a0e1681cd5722827af..1d2001f3947ece70a8e836f2bce052cee201fa03 100644 (file)
--- a/branches/fab_cm_branch/core/al/kernel/SOURCES
+++ b/branches/fab_cm_branch/core/al/kernel/SOURCES
@@ -8,7 +8,6 @@ SOURCES= ibal.rc                        \
        al_ca_pnp.c                             \\r
        al_ci_ca.c                              \\r
        al_cm_cep.c                             \\r
-       al_cm_qp.c                              \\r
        al_dev.c                                \\r
        al_driver.c                             \\r
        al_ioc_pnp.c                    \\r
@@ -27,6 +26,7 @@ SOURCES= ibal.rc                      \
        ..\al_av.c                              \\r
        ..\al_ca.c                              \\r
        ..\al_ci_ca_shared.c    \\r
+       ..\al_cm_qp.c                   \\r
        ..\al_common.c                  \\r
        ..\al_cq.c                              \\r
        ..\al_dm.c                              \\r

diff --git a/branches/fab_cm_branch/inc/ics_ver.h b/branches/fab_cm_branch/inc/ics_ver.h
index d925eb3b3c4b48de716daeb5a44edc76f70e33ba..759ddd42ef588edddd888b47ed768f61a01bd9a5 100644 (file)
--- a/branches/fab_cm_branch/inc/ics_ver.h
+++ b/branches/fab_cm_branch/inc/ics_ver.h
@@ -42,7 +42,7 @@
 #endif\r
 \r
 #ifndef VER_FILEBUILD\r
-#define VER_FILEBUILD                          31\r
+#define VER_FILEBUILD                          32\r
 #endif\r
 \r
 #ifndef VER_FILEREV\r

diff --git a/branches/fab_cm_branch/ulp/dapl/dapl/common/dapl_sp_util.c b/branches/fab_cm_branch/ulp/dapl/dapl/common/dapl_sp_util.c
index 268b62003925731f75d2baa65071377aa9ac958a..a5554bf4d3bfeb29d7daa802301c6c52b483a46d 100644 (file)
--- a/branches/fab_cm_branch/ulp/dapl/dapl/common/dapl_sp_util.c
+++ b/branches/fab_cm_branch/ulp/dapl/dapl/common/dapl_sp_util.c
@@ -205,7 +205,7 @@ dapl_sp_search_cr (
 \r
     do \r
     {\r
-       if ( !memcmp( &cr_ptr->ib_cm_handle, &ib_cm_handle, sizeof(ib_cm_handle_t) ) )\r
+       if ( cr_ptr->ib_cm_handle.cid == ib_cm_handle.cid )\r
        {\r
            cr_ptr_fnd = cr_ptr;\r
 \r

diff --git a/branches/fab_cm_branch/ulp/dapl/dapl/ibal/dapl_ibal_cm.c b/branches/fab_cm_branch/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
index cac1fa9bb4ae5840151ced9d46e16aae84c40225..cd180bdde048fc81290e10e03febd397ce929059 100644 (file)
--- a/branches/fab_cm_branch/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
+++ b/branches/fab_cm_branch/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
@@ -53,7 +53,7 @@ dapli_ib_reg_svc_cb (
 {\r
     DAPL_HCA *hca_ptr;\r
 \r
-    hca_ptr = (DAPL_HCA *) p_reg_svc_rec->svc_context;\r
+    hca_ptr = (DAPL_HCA * __ptr64) p_reg_svc_rec->svc_context;\r
 \r
     dapl_os_assert (hca_ptr);\r
 \r
@@ -419,6 +419,7 @@ DAT_RETURN
 dapls_ib_ns_create_gid_map (\r
         IN        DAPL_HCA                *hca_ptr)\r
 {\r
+       UNUSED_PARAM( hca_ptr );\r
     return (DAT_SUCCESS);\r
 }\r
 \r
@@ -427,6 +428,7 @@ DAT_RETURN
 dapls_ib_ns_remove_gid_map (\r
         IN        DAPL_HCA                *hca_ptr)\r
 {\r
+       UNUSED_PARAM( hca_ptr );\r
     return (DAT_SUCCESS);\r
 }\r
 \r
@@ -461,7 +463,7 @@ dapli_ib_sa_query_cb (
             p_path_rec = ib_get_query_path_rec (p_query_rec->p_result_mad, 0);\r
             if (p_path_rec) \r
             {\r
-                dapl_os_memcpy ((void *) p_query_rec->query_context, \r
+                dapl_os_memcpy ((void * __ptr64) p_query_rec->query_context, \r
                                 (void *) p_path_rec,\r
                                 sizeof (ib_path_rec_t));\r
                 dapl_dbg_log (\r
@@ -484,7 +486,7 @@ dapli_ib_sa_query_cb (
             p_svc_rec = ib_get_query_svc_rec (p_query_rec->p_result_mad, 0);\r
             if (p_svc_rec) \r
             {\r
-                dapl_os_memcpy ((void *) p_query_rec->query_context, \r
+                dapl_os_memcpy ((void * __ptr64) p_query_rec->query_context, \r
                                 (void *) p_svc_rec,\r
                                 sizeof (ib_service_record_t));\r
                 dapl_dbg_log (\r
@@ -506,7 +508,7 @@ dapli_ib_sa_query_cb (
         {\r
             ib_user_query_t    *p_user_query;\r
 \r
-            p_user_query = (ib_user_query_t *) p_query_rec->query_context;\r
+            p_user_query = (ib_user_query_t * __ptr64) p_query_rec->query_context;\r
             if (p_user_query)\r
             {\r
                 switch (p_user_query->attr_id)\r
@@ -574,6 +576,7 @@ static void
 dapli_ibal_listen_err_cb (\r
         IN    ib_listen_err_rec_t          *p_listen_err_rec )\r
 {\r
+       UNUSED_PARAM( p_listen_err_rec );\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, "--> %s: CM callback listen error\n",\r
                   "DiLEcb");\r
 }\r
@@ -582,6 +585,7 @@ static void
 dapli_ib_cm_apr_cb (\r
         IN    ib_cm_apr_rec_t          *p_cm_apr_rec )\r
 {\r
+       UNUSED_PARAM( p_cm_apr_rec );\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCAcb: CM callback APR (Alternate Path Request)\n");\r
 }\r
@@ -590,6 +594,7 @@ static void
 dapli_ib_cm_lap_cb (\r
         IN    ib_cm_lap_rec_t          *p_cm_lap_rec )\r
 {\r
+       UNUSED_PARAM( p_cm_lap_rec );\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCLcb: CM callback LAP (Load Alternate Path)\n");\r
 }\r
@@ -604,7 +609,7 @@ dapli_ib_cm_dreq_cb (
     \r
        dapl_os_assert (p_cm_dreq_rec);\r
 \r
-    ep_ptr  = (DAPL_EP *) p_cm_dreq_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP * __ptr64) p_cm_dreq_rec->qp_context;\r
 \r
     if ( ep_ptr == NULL ||\r
          ep_ptr->header.magic == DAPL_MAGIC_INVALID )\r
@@ -652,7 +657,7 @@ dapli_ib_cm_dreq_cb (
 \r
         dapls_cr_callback ( p_cm_dreq_rec->h_cm_dreq,\r
                             IB_CME_DISCONNECTED,\r
-                            (void *) p_cm_dreq_rec->p_dreq_pdata,\r
+                            (void * __ptr64) p_cm_dreq_rec->p_dreq_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
     }\r
@@ -662,7 +667,7 @@ dapli_ib_cm_dreq_cb (
 \r
         dapl_evd_connection_callback ( p_cm_dreq_rec->h_cm_dreq,\r
                                        IB_CME_DISCONNECTED,\r
-                                       (void *) p_cm_dreq_rec->p_dreq_pdata,\r
+                                       (void * __ptr64) p_cm_dreq_rec->p_dreq_pdata,\r
                                        p_cm_dreq_rec->qp_context);\r
     }\r
 }\r
@@ -676,7 +681,7 @@ dapli_ib_cm_drep_cb (
     \r
     dapl_os_assert (p_cm_drep_rec != NULL);\r
 \r
-    ep_ptr  = (DAPL_EP *) p_cm_drep_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP * __ptr64) p_cm_drep_rec->qp_context;\r
 \r
        if (ep_ptr)\r
        {\r
@@ -699,7 +704,7 @@ dapli_ib_cm_drep_cb (
 \r
                        dapls_cr_callback ( ep_ptr->cm_handle,\r
                             IB_CME_DISCONNECTED,\r
-                            (void *) p_cm_drep_rec->p_drep_pdata,\r
+                            (void * __ptr64) p_cm_drep_rec->p_drep_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
                }\r
@@ -709,7 +714,7 @@ dapli_ib_cm_drep_cb (
 \r
                        dapl_evd_connection_callback ( ep_ptr->cm_handle,\r
                                        IB_CME_DISCONNECTED,\r
-                                       (void *) p_cm_drep_rec->p_drep_pdata,\r
+                                       (void * __ptr64) p_cm_drep_rec->p_drep_pdata,\r
                                        p_cm_drep_rec->qp_context);\r
                }\r
        }\r
@@ -731,10 +736,10 @@ dapli_ib_cm_rep_cb (
 \r
     dapl_os_memzero (&cm_rtu, sizeof ( ib_cm_rtu_t ));\r
 \r
-    dapl_os_assert ( ((DAPL_HEADER *) p_cm_rep_rec->qp_context)->magic == \r
+    dapl_os_assert ( ((DAPL_HEADER * __ptr64) p_cm_rep_rec->qp_context)->magic == \r
                      DAPL_MAGIC_EP );\r
                          \r
-    ep_ptr  = (DAPL_EP *) p_cm_rep_rec->qp_context;\r
+    ep_ptr  = (DAPL_EP * __ptr64) p_cm_rep_rec->qp_context;\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCRpcb: EP = %p local_max_rdma_read_in %d\n", \r
                   ep_ptr, p_cm_rep_rec->resp_res);\r
@@ -766,7 +771,7 @@ dapli_ib_cm_rep_cb (
         cm_cb_op = IB_CME_LOCAL_FAILURE;\r
     }\r
 \r
-    prd_ptr = (DAPL_PRIVATE *) p_cm_rep_rec->p_rep_pdata;\r
+    prd_ptr = (DAPL_PRIVATE * __ptr64) p_cm_rep_rec->p_rep_pdata;\r
 \r
 #ifdef DAPL_DBG\r
 #if 0\r
@@ -791,7 +796,7 @@ dapli_ib_cm_rep_cb (
                             p_cm_rep_rec->h_cm_rep,\r
                             cm_cb_op,\r
                             (void *) prd_ptr,\r
-                            (void *) p_cm_rep_rec->qp_context);\r
+                            (void * __ptr64) p_cm_rep_rec->qp_context);\r
 }\r
 \r
 \r
@@ -804,7 +809,7 @@ dapli_ib_cm_rej_cb (
 \r
     dapl_os_assert (p_cm_rej_rec);\r
 \r
-    ep_ptr = (DAPL_EP *) p_cm_rej_rec->qp_context;\r
+    ep_ptr = (DAPL_EP * __ptr64) p_cm_rej_rec->qp_context;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_CM, \r
                   "--> DiCRjcb: EP = %p QP = %p rej reason = 0x%x\n", \r
@@ -865,7 +870,7 @@ dapli_ib_cm_rej_cb (
     {\r
         dapls_cr_callback ( ep_ptr->cm_handle,\r
                             cm_event,\r
-                            (void *) p_cm_rej_rec->p_rej_pdata,\r
+                            (void * __ptr64) p_cm_rej_rec->p_rej_pdata,\r
                             (void *) ((DAPL_CR *) ep_ptr->cr_ptr)->sp_ptr,\r
                             NULL);\r
     }\r
@@ -873,8 +878,8 @@ dapli_ib_cm_rej_cb (
     {\r
         dapl_evd_connection_callback ( ep_ptr->cm_handle,\r
                                        cm_event,\r
-                                       (void *) p_cm_rej_rec->p_rej_pdata,\r
-                                       (void *) p_cm_rej_rec->qp_context);\r
+                                       (void * __ptr64) p_cm_rej_rec->p_rej_pdata,\r
+                                       (void * __ptr64) p_cm_rej_rec->qp_context);\r
     }\r
 \r
 }\r
@@ -889,7 +894,7 @@ dapli_ib_cm_req_cb (
 \r
     dapl_os_assert (p_cm_req_rec);\r
 \r
-    sp_ptr = (DAPL_SP *) p_cm_req_rec->context;\r
+    sp_ptr = (DAPL_SP * __ptr64) p_cm_req_rec->context;\r
 \r
     dapl_os_assert (sp_ptr);\r
 \r
@@ -970,8 +975,8 @@ dapli_ib_cm_req_cb (
 \r
     dapls_cr_callback ( p_cm_req_rec->h_cm_req,\r
                         IB_CME_CONNECTION_REQUEST_PENDING,\r
-                        (void *) p_cm_req_rec->p_req_pdata,\r
-                        (void *) p_cm_req_rec->context,\r
+                        (void * __ptr64) p_cm_req_rec->p_req_pdata,\r
+                        (void * __ptr64) p_cm_req_rec->context,\r
                         (DAT_IA_ADDRESS_PTR)&dest_ia_addr);\r
 }\r
 \r
@@ -980,6 +985,7 @@ static void
 dapli_ib_cm_mra_cb (\r
         IN    ib_cm_mra_rec_t          *p_cm_mra_rec )\r
 {\r
+       UNUSED_PARAM( p_cm_mra_rec );\r
     dapl_dbg_log (DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK, \r
                        "--> DiCMcb: CM callback MRA\n");\r
 }\r
@@ -992,7 +998,7 @@ dapli_ib_cm_rtu_cb (
 \r
     dapl_os_assert (p_cm_rtu_rec != NULL);\r
    \r
-    ep_ptr = (DAPL_EP *) p_cm_rtu_rec->qp_context;\r
+    ep_ptr = (DAPL_EP * __ptr64) p_cm_rtu_rec->qp_context;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK, \r
                   "--> DiCRucb: EP = %p QP = %p\n", ep_ptr, ep_ptr->qp_handle); \r
@@ -1005,7 +1011,7 @@ dapli_ib_cm_rtu_cb (
 \r
         dapls_cr_callback ( ep_ptr->cm_handle,\r
                             IB_CME_CONNECTED,\r
-                            (void *) p_cm_rtu_rec->p_rtu_pdata,\r
+                            (void * __ptr64) p_cm_rtu_rec->p_rtu_pdata,\r
                             (void *) sp_ptr,\r
                             NULL);\r
                             \r
@@ -1015,7 +1021,7 @@ dapli_ib_cm_rtu_cb (
         dapl_evd_connection_callback ( \r
                             ep_ptr->cm_handle,\r
                             IB_CME_CONNECTED,\r
-                            (void *) p_cm_rtu_rec->p_rtu_pdata,\r
+                            (void * __ptr64) p_cm_rtu_rec->p_rtu_pdata,\r
                             (void *) ep_ptr);\r
     }\r
 }\r
@@ -1039,6 +1045,9 @@ dapls_ib_cm_remote_addr (
     IN      DAPL_PRIVATE            *prd_ptr,\r
     OUT     DAT_SOCK_ADDR6          *remote_ia_address )\r
 {\r
+       UNUSED_PARAM( dat_handle );\r
+       UNUSED_PARAM( prd_ptr );\r
+       UNUSED_PARAM( remote_ia_address );\r
     return DAT_SUCCESS;\r
 }\r
 \r
@@ -1320,6 +1329,8 @@ DAT_RETURN
     ib_api_status_t                ib_status;\r
     ib_cm_dreq_t                   cm_dreq;\r
 \r
+       UNUSED_PARAM( disconnect_flags );\r
+\r
     ia_ptr    = ep_ptr->header.owner_ia;\r
     ib_status = IB_SUCCESS;\r
 \r
@@ -1481,6 +1492,8 @@ DAT_RETURN dapls_ib_remove_conn_listener (
     ib_api_status_t                    ib_status;\r
        DAT_RETURN                              dat_status = DAT_SUCCESS;\r
        \r
+       UNUSED_PARAM( ia_ptr );\r
+\r
     if (sp_ptr->cm_srvc_handle)\r
     {\r
                ib_status = ib_cm_cancel (sp_ptr->cm_srvc_handle, \r
@@ -1562,7 +1575,7 @@ dapls_ib_reject_connection (
     if (ib_status != IB_SUCCESS)\r
     {\r
         dapl_dbg_log ( DAPL_DBG_TYPE_ERR,"--> DsRjC: cm_handle = %p reject failed = %s\n", \r
-                ib_cm_handle, ib_get_err_str(ib_status));\r
+                &ib_cm_handle, ib_get_err_str(ib_status));\r
     }\r
 \r
     return ( dapl_ib_status_convert ( ib_status ) );\r
@@ -1816,7 +1829,7 @@ dapls_ib_cr_handoff (
     \r
     cr_ptr = (DAPL_CR *) cr_handle;\r
 \r
-    if (cr_ptr->ib_cm_handle.cid = 0xFFFFFFFF)\r
+    if (cr_ptr->ib_cm_handle.cid == 0xFFFFFFFF)\r
     {\r
         dapl_dbg_log ( DAPL_DBG_TYPE_ERR,"--> DsCH: CR = %p invalid cm handle\n", cr_ptr);\r
         return DAT_INVALID_PARAMETER;\r
@@ -1908,6 +1921,8 @@ dapls_ib_private_data_size (
 {\r
     int  size;\r
 \r
+       UNUSED_PARAM( prd_ptr );\r
+\r
     switch (conn_op)\r
     {\r
         case DAPL_PDATA_CONN_REQ:\r