[ofa-general] [PATCH] opensm: Add infrastructure support for more newly allocated PortInfo CapabilityMask bits

[Hal Rosenstock]

Per published MgtWG errata:
RefID 4484 - vendor specific MADs
RefID 4575 - multicast PKey trap suppression
RefID 4641 - hierarchy info

Signed-off-by: Hal Rosenstock <hal.rosenstock at gmail.com>
---
diff --git a/opensm/include/iba/ib_types.h b/opensm/include/iba/ib_types.h
index c9d81cb..25ed35f 100644
--- a/opensm/include/iba/ib_types.h
+++ b/opensm/include/iba/ib_types.h
@@ -4490,10 +4490,10 @@ typedef struct _ib_port_info {
 #define IB_PORT_CAP_HAS_CLIENT_REREG (CL_HTON32(0x02000000))
 #define IB_PORT_CAP_HAS_OTHER_LOCAL_CHANGES_NTC (CL_HTON32(0x04000000))
 #define IB_PORT_CAP_HAS_LINK_SPEED_WIDTH_PAIRS_TBL (CL_HTON32(0x08000000))
-#define IB_PORT_CAP_RESV28        (CL_HTON32(0x10000000))
-#define IB_PORT_CAP_RESV29        (CL_HTON32(0x20000000))
+#define IB_PORT_CAP_HAS_VEND_MADS (CL_HTON32(0x10000000))
+#define IB_PORT_CAP_HAS_MCAST_PKEY_TRAP_SUPPRESS (CL_HTON32(0x20000000))
 #define IB_PORT_CAP_HAS_MCAST_FDB_TOP (CL_HTON32(0x40000000))
-#define IB_PORT_CAP_RESV31        (CL_HTON32(0x80000000))
+#define IB_PORT_CAP_HAS_HIER_INFO (CL_HTON32(0x80000000))
 
 /****f* IBA Base: Types/ib_port_info_get_port_state
 * NAME
diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c
index 341d778..4b4e320 100644
--- a/opensm/opensm/osm_helper.c
+++ b/opensm/opensm/osm_helper.c
@@ -752,15 +752,15 @@ static void dbg_get_capabilities_str(IN char *p_buf, IN const uint32_t buf_size,
 				&total_len) != IB_SUCCESS)
 			return;
 	}
-	if (p_pi->capability_mask & IB_PORT_CAP_RESV28) {
+	if (p_pi->capability_mask & IB_PORT_CAP_HAS_VEND_MADS) {
 		if (dbg_do_line(&p_local, buf_size, p_prefix_str,
-				"IB_PORT_CAP_RESV28\n",
+				"IB_PORT_CAP_HAS_VEND_MADS\n",
 				&total_len) != IB_SUCCESS)
 			return;
 	}
-	if (p_pi->capability_mask & IB_PORT_CAP_RESV29) {
+	if (p_pi->capability_mask & IB_PORT_CAP_HAS_MCAST_PKEY_TRAP_SUPPRESS) {
 		if (dbg_do_line(&p_local, buf_size, p_prefix_str,
-				"IB_PORT_CAP_RESV29\n",
+				"IB_PORT_CAP_HAS_MCAST_PKEY_TRAP_SUPPRESS\n",
 				&total_len) != IB_SUCCESS)
 			return;
 	}
@@ -770,9 +770,9 @@ static void dbg_get_capabilities_str(IN char *p_buf, IN const uint32_t buf_size,
 				&total_len) != IB_SUCCESS)
 			return;
 	}
-	if (p_pi->capability_mask & IB_PORT_CAP_RESV31) {
+	if (p_pi->capability_mask & IB_PORT_CAP_HAS_HIER_INFO) {
 		if (dbg_do_line(&p_local, buf_size, p_prefix_str,
-				"IB_PORT_CAP_RESV31\n",
+				"IB_PORT_CAP_HAS_HIER_INFO\n",
 				&total_len) != IB_SUCCESS)
 			return;
 	}