infiniband-diags/ibqueryerrors: Add support for optional PortRcvErrorDetails counter

Commit Message

Sasha Khapyorsky Jan. 12, 2010, 7:14 p.m. UTC

None

Patch

diff --git a/infiniband-diags/src/ibqueryerrors.c b/infiniband-diags/src/ibqueryerrors.c
index 47bd2af..0ebe4bf 100644
--- a/infiniband-diags/src/ibqueryerrors.c
+++ b/infiniband-diags/src/ibqueryerrors.c
@@ -205,30 +205,31 @@  static void report_suppressed(void)
 	printf("\n");
 }
 
-static int print_xmitdisc_details(char *buf, size_t size, ib_portid_t * portid,
-				  ibnd_node_t * node, char *node_name,
-				  int portnum)
+static int query_and_dump(char *buf, size_t size, ib_portid_t * portid,
+			 ibnd_node_t * node, char *node_name, int portnum,
+			 const char *attr_name, uint16_t attr_id,
+			 int start_field, int end_field)
 {
 	uint8_t pc[1024];
 	uint32_t val = 0;
 	int i, n;
 
-	memset(pc, 0, 1024);
+	memset(pc, 0, sizeof(pc));
 
-	if (!pma_query_via(pc, portid, portnum, ibd_timeout,
-			   IB_GSI_PORT_XMIT_DISCARD_DETAILS, ibmad_port)) {
-		IBWARN("IB_GSI_PORT_XMIT_DISCARD_DETAILS query failed on %s, "
-		       "%s port %d", node_name, portid2str(portid), portnum);
+	if (!pma_query_via(pc, portid, portnum, ibd_timeout, attr_id,
+			   ibmad_port)) {
+		IBWARN("%s query failed on %s, %s port %d", attr_name,
+			node_name, portid2str(portid), portnum);
 		return 0;
 	}
 
-	for (n = 0, i = IB_PC_XMT_INACT_DISC_F; i <= IB_PC_XMT_SW_HOL_DISC_F;
-	     i++) {
+	for (n = 0, i = start_field; i < end_field; i++) {
 		mad_decode_field(pc, i, (void *)&val);
 		if (val)
 			n += snprintf(buf + n, size - n, " [%s == %u]",
 				      mad_field_name(i), val);
 	}
+
 	return n;
 }
 
@@ -256,8 +257,20 @@  static void print_results(ib_portid_t * portid, char *node_name,
 
 		/* If there are PortXmitDiscards, get details (if supported) */
 		if (i == IB_PC_XMT_DISCARDS_F && details && val) {
-			n += print_xmitdisc_details(str + n, 1024 - n, portid,
-						    node, node_name, portnum);
+			n += query_and_dump(str + n, sizeof(buf) - n, portid,
+					    node, node_name, portnum,
+					    "PortXmitDiscardDetails",
+					    IB_GSI_PORT_XMIT_DISCARD_DETAILS,
+					    IB_PC_RCV_LOCAL_PHY_ERR_F,
+					    IB_PC_RCV_ERR_LAST_F);
+		/* If there are PortRcvErrors, get details (if supported) */
+		} else if (i == IB_PC_ERR_RCV_F && details && val) {
+			n += query_and_dump(str + n, sizeof(buf) - n, portid,
+					    node, node_name, portnum,
+					    "PortRecvErrorsDetails",
+					    IB_GSI_PORT_RCV_ERROR_DETAILS,
+					    IB_PC_XMT_INACT_DISC_F,
+					    IB_PC_XMT_DISC_LAST_F);
 		}
 	}