[ofa-general] [PATCH][master] dapl: add vendor_err with DTO error logging

[Davis, Arlin R]

DAPL_GET_CQE_VENDOR_ERR added to get vendor_err via cq entry.

Signed-off by: Arlin Davis ardavis at ichips.intel.com
---
 dapl/common/dapl_evd_util.c   |   16 ++++++++++------
 dapl/openib_cma/dapl_ib_dto.h |    2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dapl/common/dapl_evd_util.c b/dapl/common/dapl_evd_util.c
index 32fbaba..293759f 100755
--- a/dapl/common/dapl_evd_util.c
+++ b/dapl/common/dapl_evd_util.c
@@ -543,9 +543,12 @@ bail:
     return dat_status;
 }
 
-#if defined(DAPL_DBG) && !defined(DAPL_GET_CQE_OP_STR)
+#if !defined(DAPL_GET_CQE_OP_STR)
 #define DAPL_GET_CQE_OP_STR(e) "Unknown CEQ OP String?"
 #endif
+#if !defined(DAPL_GET_CQE_VENDOR_ERR)
+#define DAPL_GET_CQE_VENDOR_ERR(e) 0
+#endif
 
 /*
  * dapli_evd_eh_print_cqe
@@ -565,7 +568,6 @@ dapli_evd_eh_print_cqe (
     IN 	ib_work_completion_t	*cqe_ptr)
 {
 #ifdef DAPL_DBG
-
     dapl_dbg_log (DAPL_DBG_TYPE_CALLBACK,
 		  "\t >>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<\n");
     dapl_dbg_log (DAPL_DBG_TYPE_CALLBACK,
@@ -583,8 +585,9 @@ dapli_evd_eh_print_cqe (
 		  DAPL_GET_CQE_BYTESNUM (cqe_ptr));
     }
     dapl_dbg_log (DAPL_DBG_TYPE_CALLBACK,
-		  "\t\t status %d\n",
-		  DAPL_GET_CQE_STATUS (cqe_ptr));
+		  "\t\t status %d vendor_err 0x%x\n",
+		  DAPL_GET_CQE_STATUS(cqe_ptr),
+		  DAPL_GET_CQE_VENDOR_ERR(cqe_ptr));
     dapl_dbg_log (DAPL_DBG_TYPE_CALLBACK,
 		  "\t >>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<\n");
 #endif
@@ -1215,9 +1218,10 @@ dapli_evd_cqe_to_event (
 	}
 
 	dapl_log(DAPL_DBG_TYPE_ERR,
-		 "DTO completion ERR: status %d, opcode %s \n",
+		 "DTO completion ERR: status %d, opcode %s, vendor_err
0x%x\n",
 		 DAPL_GET_CQE_STATUS(cqe_ptr),
-		 DAPL_GET_CQE_OP_STR(cqe_ptr));
+		 DAPL_GET_CQE_OP_STR(cqe_ptr),
+		 DAPL_GET_CQE_VENDOR_ERR(cqe_ptr));
     }
 }
 
diff --git a/dapl/openib_cma/dapl_ib_dto.h
b/dapl/openib_cma/dapl_ib_dto.h
index a90aea2..b111e5e 100644
--- a/dapl/openib_cma/dapl_ib_dto.h
+++ b/dapl/openib_cma/dapl_ib_dto.h
@@ -458,10 +458,10 @@ STATIC _INLINE_ int
dapls_cqe_opcode(ib_work_completion_t *cqe_p)
 	}
 }
 
-
 #define DAPL_GET_CQE_OPTYPE(cqe_p) dapls_cqe_opcode(cqe_p)
 #define DAPL_GET_CQE_WRID(cqe_p) ((ib_work_completion_t*)cqe_p)->wr_id
 #define DAPL_GET_CQE_STATUS(cqe_p)
((ib_work_completion_t*)cqe_p)->status
+#define DAPL_GET_CQE_VENDOR_ERR(cqe_p)
((ib_work_completion_t*)cqe_p)->vendor_err
 #define DAPL_GET_CQE_BYTESNUM(cqe_p)
((ib_work_completion_t*)cqe_p)->byte_len
 #define DAPL_GET_CQE_IMMED_DATA(cqe_p)
((ib_work_completion_t*)cqe_p)->imm_data
 
-- 
1.5.2.5