OpenSM: Add vendor decode support some new IB hardware vendors

(PathScale and IBM)

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

diff --git a/trunk/ulp/opensm/user/libopensm/osm_helper.c b/trunk/ulp/opensm/user/libopensm/osm_helper.c
index c9403acd8271d7d61ad93852323b7bf32b46365d..bac57b39f2c7b02f85422507c0b9a7b8620f07ea 100644 (file)
--- a/trunk/ulp/opensm/user/libopensm/osm_helper.c
+++ b/trunk/ulp/opensm/user/libopensm/osm_helper.c
@@ -961,7 +961,7 @@ osm_dump_service_record(
   if( osm_log_is_active( p_log, log_level ) )
   {
     sprintf(buf_service_key,
-            "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+            "0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             p_sr->service_key[0],
             p_sr->service_key[1],
             p_sr->service_key[2],
@@ -1384,9 +1384,9 @@ osm_dump_notice(
 
       osm_log( p_log, log_level,
                "Generic Notice dump:\n"
-               "\t\t\t\ttype....................0x%02X\n"
-               "\t\t\t\tprod_type...............%u\n"
-               "\t\t\t\ttrap_num................%u\n%s"
+               "\t\t\t\ttype.....................0x%02X\n"
+               "\t\t\t\tprod_type................%u\n"
+               "\t\t\t\ttrap_num.................%u\n%s"
                "",
                ib_notice_get_type(p_ntci),
                cl_ntoh32(ib_notice_get_prod_type(p_ntci)),
@@ -1398,9 +1398,9 @@ osm_dump_notice(
     {
       osm_log( p_log, log_level,
                "Vendor Notice dump:\n"
-               "\t\t\t\ttype....................0x%04x\n"
-               "\t\t\t\tvendor..................%u\n"
-               "\t\t\t\tdevice_id...............%u\n"
+               "\t\t\t\ttype.....................0x%04x\n"
+               "\t\t\t\tvendor...................%u\n"
+               "\t\t\t\tdevice_id................%u\n"
                "",
                cl_ntoh16(ib_notice_get_type(p_ntci)),
                cl_ntoh32(ib_notice_get_vend_id(p_ntci)),
@@ -1848,6 +1848,8 @@ osm_get_node_type_str_fixed_width(
 #define OSM_VENDOR_ID_FUJITSU2      0x000B5D
 #define OSM_VENDOR_ID_VOLTAIRE   0x0008F1
 #define OSM_VENDOR_ID_YOTTAYOTTA    0x000453
+#define OSM_VENDOR_ID_PATHSCALE     0x001175
+#define OSM_VENDOR_ID_IBM           0x000255
 
 /**********************************************************************
  **********************************************************************/
@@ -1863,6 +1865,8 @@ osm_get_manufacturer_str(
   static const char* fujitsu_str       = "Fujitsu    ";
   static const char* voltaire_str      = "Voltaire   ";
   static const char* yotta_str         = "YottaYotta ";
+  static const char* pathscale_str     = "PathScale  ";
+  static const char* ibm_str           = "IBM        ";
   static const char* unknown_str       = "Unknown    ";
 
   switch( (uint32_t)(guid_ho >> (5 * 8)) )
@@ -1884,6 +1888,10 @@ osm_get_manufacturer_str(
     return( voltaire_str );
   case OSM_VENDOR_ID_YOTTAYOTTA:
     return( yotta_str );
+  case OSM_VENDOR_ID_PATHSCALE:
+    return( pathscale_str );
+  case OSM_VENDOR_ID_IBM:
+    return( ibm_str );
   default:
     return( unknown_str );
   }