From: ftillier Date: Fri, 29 Jul 2005 00:25:44 +0000 (+0000) Subject: Updated resize CQ to return detailed status in case of failure. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e477e825ad84fae00ba3fe21baa8b6b185c25032;p=~shefty%2Frdma-win.git Updated resize CQ to return detailed status in case of failure. git-svn-id: svn://openib.tc.cornell.edu/gen1@47 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/hw/mt23108/kernel/hca_verbs.c b/trunk/hw/mt23108/kernel/hca_verbs.c index b61dc7dd..7be99228 100644 --- a/trunk/hw/mt23108/kernel/hca_verbs.c +++ b/trunk/hw/mt23108/kernel/hca_verbs.c @@ -2065,13 +2065,11 @@ mlnx_resize_cq ( // for kernel mode calls - obtain the saved app resources. Use prep->call->done sequence cq_ul_resources_p = hobul_p->cq_info_tbl[cq_idx].cq_ul_resources_p; - if (HH_OK != THHUL_cqm_resize_cq_prep( + status = THHUL_cqm_resize_cq_prep( hobul_p->hhul_hndl, hhul_cq_hndl, - *p_size, p_size, cq_ul_resources_p)) - { - status = IB_ERROR; + *p_size, p_size, cq_ul_resources_p ); + if( status != IB_SUCCESS ) goto cleanup_locked; - } } if (HH_OK != THH_hob_resize_cq(hobul_p->hh_hndl, cq_num, cq_ul_resources_p)) { diff --git a/trunk/hw/mt23108/user/mlnx_ual_cq.c b/trunk/hw/mt23108/user/mlnx_ual_cq.c index 32473df4..bb1ebf81 100644 --- a/trunk/hw/mt23108/user/mlnx_ual_cq.c +++ b/trunk/hw/mt23108/user/mlnx_ual_cq.c @@ -343,14 +343,14 @@ mlnx_pre_resize_cq ( CL_TRACE (MLNX_TRACE_LVL_8, mlnx_dbg_lvl, ("Before resize_cq_prep *p_size = %d\n", *p_size)); - if (HH_OK != THHUL_cqm_resize_cq_prep ( p_hobul->hhul_hca_hndl, + status = THHUL_cqm_resize_cq_prep ( p_hobul->hhul_hca_hndl, p_cq_info->hhul_cq_hndl, *p_size, p_size, - p_cq_ul_resources)) + p_cq_ul_resources); + if( status != IB_SUCCESS ) { CL_TRACE (MLNX_TRACE_LVL_1, mlnx_dbg_lvl, ("THHUL_cqm_resize_cq_prep failed\n")); - status = IB_ERROR; break; } CL_TRACE (MLNX_TRACE_LVL_8, mlnx_dbg_lvl, diff --git a/trunk/hw/mt23108/vapi/Hca/hcahal/hhul.h b/trunk/hw/mt23108/vapi/Hca/hcahal/hhul.h index f8f959bc..98409c1f 100644 --- a/trunk/hw/mt23108/vapi/Hca/hcahal/hhul.h +++ b/trunk/hw/mt23108/vapi/Hca/hcahal/hhul.h @@ -34,6 +34,7 @@ #ifndef H_HHUL_H #define H_HHUL_H +#include #include #include @@ -204,7 +205,7 @@ typedef struct HHUL_if_ops_st { HH_cq_hndl_t hh_cq, void* cq_ul_resources_p); - HH_ret_t (*HHULIF_resize_cq_prep)(HHUL_hca_hndl_t hca_hndl, + ib_api_status_t (*HHULIF_resize_cq_prep)(HHUL_hca_hndl_t hca_hndl, HHUL_cq_hndl_t cq, VAPI_cqe_num_t num_o_cqes, VAPI_cqe_num_t* num_o_cqes_p, diff --git a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/cmdif/cmdif.h b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/cmdif/cmdif.h index 5019c066..947a743c 100644 --- a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/cmdif/cmdif.h +++ b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/cmdif/cmdif.h @@ -173,17 +173,6 @@ HH_ret_t THH_cmd_revoke_ddrmm(THH_cmd_t cmd_if); * * ******************************************************************************/ -#ifdef IN -#undef IN -#endif -#define IN - - -#ifdef OUT -#undef OUT -#endif -#define OUT - /* System commands */ THH_cmd_status_t THH_cmd_SYS_EN(IN THH_cmd_t cmd_if); THH_cmd_status_t THH_cmd_SYS_DIS(IN THH_cmd_t cmd_if); @@ -296,7 +285,4 @@ THH_cmd_status_t THH_cmd_handle_fatal(IN THH_cmd_t cmd_if); const char *str_THH_cmd_status_t(THH_cmd_status_t status); const char *cmd_str(tavor_if_cmd_t opcode); -#undef IN -#undef OUT - #endif /* __cmdif_h */ diff --git a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.c b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.c index 942ef9fd..7fc764e8 100644 --- a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.c +++ b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.c @@ -985,7 +985,7 @@ HH_ret_t THHUL_cqm_destroy_cq_done( } -HH_ret_t THHUL_cqm_resize_cq_prep( +ib_api_status_t THHUL_cqm_resize_cq_prep( /*IN*/ HHUL_hca_hndl_t hca_hndl, /*IN*/ HHUL_cq_hndl_t cq, /*IN*/ VAPI_cqe_num_t num_o_cqes, @@ -1001,25 +1001,25 @@ HH_ret_t THHUL_cqm_resize_cq_prep( if (cq_p == NULL) { MTL_ERROR1("%s: NULL CQ handle.\n",__func__); - return HH_EINVAL; + return IB_INVALID_CQ_HANDLE; } rc= THHUL_hob_get_hca_ul_res(hca_hndl,&hca_ul_res); if (rc != HH_OK) { MTL_ERROR2("THHUL_cqm_create_cq_prep: Failed THHUL_hob_get_hca_ul_res (err=%d).\n",rc); - return rc; + return IB_ERROR; } if (num_o_cqes > hca_ul_res.max_num_ent_cq) { MTL_ERROR2("THHUL_cqm_create_cq_prep: cq_num_of_entries requested exceeds hca cap\n"); - return HH_E2BIG_CQE_NUM; + return IB_INVALID_CQ_SIZE; } rc= cqe_buf_alloc(&new_buf,num_o_cqes); if (rc != HH_OK) { MTL_ERROR2(MT_FLFMT("%s: Allocating buffer for resized CQ 0x%X has failed"),__func__, cq_p->cq_num); - return rc; + return IB_INSUFFICIENT_MEMORY; } MOSAL_spinlock_dpc_lock(&(cq_p->cq_lock)); @@ -1028,7 +1028,7 @@ HH_ret_t THHUL_cqm_resize_cq_prep( cq_p->cq_state,cq_state_str(cq_p->cq_state)); MOSAL_spinlock_unlock(&(cq_p->cq_lock)); cqe_buf_free(&new_buf); - return HH_EBUSY; + return IB_INVALID_STATE; } memcpy(&cq_p->resized_buf, &new_buf, sizeof(THHUL_cqe_buf_t)); @@ -1049,7 +1049,7 @@ HH_ret_t THHUL_cqm_resize_cq_prep( ul_res_p->cqe_buf_sz= (1U<resized_buf.log2_num_o_cqes) * CQE_SZ ; *num_o_cqes_p= (1U<resized_buf.log2_num_o_cqes) - 1 - cq_p->resized_buf.spare_cqes; - return HH_OK; + return IB_SUCCESS; } diff --git a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.h b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.h index f0271689..4ce3a0a1 100644 --- a/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.h +++ b/trunk/hw/mt23108/vapi/Hca/hcahal/tavor/thhul_cqm/thhul_cqm.h @@ -36,6 +36,7 @@ #include #include #include +#include DLL_API HH_ret_t THHUL_cqm_create( @@ -71,7 +72,7 @@ DLL_API HH_ret_t THHUL_cqm_destroy_cq_done( ); -DLL_API HH_ret_t THHUL_cqm_resize_cq_prep( +DLL_API ib_api_status_t THHUL_cqm_resize_cq_prep( /*IN*/ HHUL_hca_hndl_t hca_hndl, /*IN*/ HHUL_cq_hndl_t cq, /*IN*/ VAPI_cqe_num_t num_o_cqes, @@ -95,7 +96,6 @@ DLL_API HH_ret_t THHUL_cqm_cq_cleanup( ); #ifdef WIN32 -#include DLL_API ib_api_status_t THHUL_cqm_poll4wc( IN HHUL_hca_hndl_t hca_hndl,