Merge pull request #206 from Mellanox/master_devel

master_devel merge to master (4.13.0)

Author: DanGoldbergMellanox

Makefile.am

@@ -34,7 +34,7 @@ SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DI
 
 DIST_SUBDIRS = tracers
 
-man_MANS = man/mstflint.1 man/mstconfig.1 man/mstmcra.1 man/mstmread.1 man/mstmwrite.1 man/mstmtserver.1 man/mstregdump.1 man/mstvpd.1 man/mstprivhost.1 man/mstarchive.1 man/mstreg.1 man/mstfwtrace.1 man/mstlink.1
+man_MANS = man/mstflint.1 man/mstconfig.1 man/mstmcra.1 man/mstmread.1 man/mstmwrite.1 man/mstmtserver.1 man/mstregdump.1 man/mstvpd.1 man/mstprivhost.1 man/mstarchive.1 man/mstreg.1 man/mstfwtrace.1 man/mstlink.1 man/mstcongestion.1 man/mstfwmanager.1 man/mstfwreset.1
 
 EXTRA_DIST = \
 	mstflint.spec \

configure.ac

@@ -31,12 +31,12 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(mstflint, 4.12.0, [email protected])
+AC_INIT(mstflint, 4.13.0, [email protected])
 
 AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
 AC_SUBST([PROJECT])
 
-AC_DEFINE_UNQUOTED([VERSION], ["4.12.0"], [Define the project version.])
+AC_DEFINE_UNQUOTED([VERSION], ["4.13.0"], [Define the project version.])
 AC_SUBST([VERSION])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -142,21 +142,21 @@ AC_SUBST(ENABLE_FWMGR)
 # XML2
 AC_MSG_CHECKING(--enable-xml2 argument)
 AC_ARG_ENABLE(xml2,
-            [  --enable-xml2           Enable mstflint libxml2 dependant features],
+            [  --enable-xml2           Enable mstflint libxml2 dependent features],
             [enable_xml2="yes"],
             [enable_xml2="no"])
 AC_MSG_RESULT($enable_xml2)
 if test [ "x$enable_xml2" = "xyes" ] || [ test "x$enable_fw_mgr" = "xyes" ]; then
     # XML2 checks
-    if test ! -f /usr/include/libxml2/libxml/xpath.h; then
-        AC_MSG_NOTICE([checking for libxml2... no])
-        AC_MSG_ERROR([libxml2: xpath.h is not found in the system PATH. make sure libxml2 headres are installed.])
-    else
-        AC_MSG_NOTICE([checking for libxml2... yes])
-        XML2_INC_DIR=/usr/include/libxml2/
-    fi
-    AC_CHECK_LIB(xml2, xmlDocDumpFormatMemoryEnc,, AC_MSG_ERROR([cannot find xml2 xmlDocDumpFormatMemoryEnc() function. Try re-installing the library...]))
-    AC_SUBST(XML2_INC_DIR)
+    AC_LANG_PUSH([C++])
+        if test "x$OS" = "xFreeBSD"; then
+            CXXFLAGS="${CXXFLAGS} -isystem /usr/local/include/libxml2"
+        else
+            CXXFLAGS="${CXXFLAGS} -isystem /usr/include/libxml2"
+        fi
+        AC_CHECK_HEADER([libxml2/libxml/xpath.h],[],[AC_MSG_ERROR([libxml2: xpath.h is not found in the system PATH. make sure libxml2 headers are installed.])])
+        AC_CHECK_LIB(xml2, xmlDocDumpFormatMemoryEnc,, AC_MSG_ERROR([cannot find xml2 xmlDocDumpFormatMemoryEnc() function. Try re-installing the library...]))
+    AC_LANG_POP([C++])
 fi
 
 AM_CONDITIONAL(DISABLE_XML2, [test  "x$enable_xml2" = "xno"])

dev_mgt/tools_dev_types.c

@@ -54,6 +54,7 @@ enum dm_dev_type {
     DM_BRIDGE,
     DM_QSFP_CABLE,
     DM_SFP_CABLE,
+    DM_LINKX // linkx chip
 };
 
 struct device_info {
@@ -71,6 +72,13 @@ struct device_info {
 #define SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR     92
 #define SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR                  64
 
+#define ARDBEG_DEVID 0x6e
+#define ARDBEG_MIRRORED_DEVID 0x70
+#define BARITONE_DEVID 0x6b
+#define BARITONE_MIRRORED_DEVID 0x71
+#define MENHIT_DEVID 0x6f
+
+
 #ifdef CABLES_SUPP
 enum dm_dev_type getCableType(u_int8_t id)
 {
@@ -217,6 +225,15 @@ static struct device_info g_devs_info[] = {
         2,                      //port_num
         DM_HCA                  //dev_type
     },
+    {
+        DeviceBlueField2,        //dm_id
+        0x214,                  //hw_dev_i
+        -1,                     //hw_rev_i
+        -1,                     //sw_dev_i
+        "BlueField2",            //name
+        2,                      //port_num
+        DM_HCA                  //dev_type
+    },
     {
         DeviceFPGANewton,       //dm_id
         0xfff,                  //hw_dev_i - Dummy device ID till we have official one
@@ -307,6 +324,33 @@ static struct device_info g_devs_info[] = {
         80,                     //port_num
         DM_SWITCH               //dev_type
     },
+    {
+        DeviceArdbeg,           //dm_id
+        0x6e,                   //hw_dev_i (ArdbegMirror 0x70)
+        -1,                     //hw_rev_i
+        -1,                     //sw_dev_i
+        "Ardbeg",               //name
+        -1,                     //port_num
+        DM_LINKX                //dev_type
+    },
+        {
+        DeviceBaritone,         //dm_id
+        0x6b,                   //hw_dev_i (BaritoneMirror 0x71)
+        -1,                     //hw_rev_i
+        -1,                     //sw_dev_i
+        "Baritone",             //name
+        -1,                     //port_num
+        DM_LINKX                //dev_type
+    },
+    {
+        DeviceMenhit,           //dm_id
+        0x6f,                   //hw_dev_i
+        -1,                     //hw_rev_i
+        -1,                     //sw_dev_i
+        "Menhit",               //name
+        -1,                     //port_num
+        DM_LINKX                //dev_type
+    },
     {
         DeviceSecureHost,       //dm_id
         0xcafe,                 //hw_dev_i
@@ -316,6 +360,15 @@ static struct device_info g_devs_info[] = {
         -1,                     //port_num
         DM_UNKNOWN              //dev_type
     },
+    {
+        DeviceSpectrum3,        //dm_id
+        0x250,                  //hw_dev_i
+        -1,                     //hw_rev_i
+        -1,                     //sw_dev_i
+        "Spectrum3",            //name
+        128,                    //port_num NEED_CHECK
+        DM_SWITCH               //dev_type
+    },
     {
         DeviceUnknown,          //dm_id
         0,                      //hw_dev_i
@@ -374,6 +427,28 @@ int dm_get_device_id(mfile *mf,
     }
 #endif
 #ifdef CABLES_SUPP
+    if (mf->tp == MST_LINKX_CHIP){
+
+        switch (mf->linkx_chip_devid){
+            case ARDBEG_DEVID:
+            case ARDBEG_MIRRORED_DEVID:
+                *ptr_dm_dev_id = DeviceArdbeg;
+                break;
+            case BARITONE_DEVID:
+            case BARITONE_MIRRORED_DEVID:
+                *ptr_dm_dev_id = DeviceBaritone;
+                break;
+            case MENHIT_DEVID:
+                *ptr_dm_dev_id = DeviceMenhit;
+                break;
+            default:
+                return 1;
+                break;
+        }
+        return 0;
+
+    }
+
     if (mf->tp == MST_CABLE) {
         //printf("-D- Getting cable ID\n");
         if (mread4(mf, CABLEID_ADDR, &dword) != 4) {
@@ -505,11 +580,21 @@ int dm_dev_is_hca(dm_dev_id_t type)
     return get_entry(type)->dev_type == DM_HCA;
 }
 
+int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type)
+{
+    return (dm_dev_is_hca(type) && (get_entry(type)->hw_dev_id >= get_entry(DeviceConnectX6)->hw_dev_id));
+}
+
 int dm_dev_is_switch(dm_dev_id_t type)
 {
     return get_entry(type)->dev_type == DM_SWITCH;
 }
 
+int dm_dev_is_200g_speed_supported_switch(dm_dev_id_t type)
+{
+    return (dm_dev_is_switch(type) && (get_entry(type)->hw_dev_id >= get_entry(DeviceQuantum)->hw_dev_id));
+}
+
 int dm_dev_is_bridge(dm_dev_id_t type)
 {
     return get_entry(type)->dev_type == DM_BRIDGE;

dev_mgt/tools_dev_types.h

@@ -79,6 +79,7 @@ enum dm_dev_id
     DeviceConnectX5,
     DeviceConnectX6,
     DeviceBlueField,
+    DeviceBlueField2,
     DeviceFPGA,             // UnSupported
     DeviceSwitchIB2,
     DeviceFPGANewton,
@@ -88,11 +89,14 @@ enum dm_dev_id
     DeviceCableSFP,
     DeviceCableSFP51,
     DeviceCableSFP51Paging,
+    DeviceArdbeg,
+    DeviceBaritone,
+    DeviceMenhit,
     DeviceSpectrum2,
     DeviceDummy,
     DeviceSecureHost,
     DeviceConnectX6DX,
-
+    DeviceSpectrum3, //Firebird
     DeviceEndMarker           // Dummy Device - Marker for indicating end of devices when iterating
 };
 
@@ -135,11 +139,21 @@ dm_dev_id_t dm_dev_str2type(const char *str);
  */
 int dm_dev_is_hca(dm_dev_id_t type);
 
+/**
+ * A predicate returning if the hca supports 200G speed and above
+ */
+int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type);
+
 /**
  * A predicate returning if the device is a switch
  */
 int dm_dev_is_switch(dm_dev_id_t type);
 
+/**
+ * A predicate returning if the switch supports 200G speed and above
+ */
+int dm_dev_is_200g_speed_supported_switch(dm_dev_id_t type);
+
 /**
  * A predicate returning if the device is a bridge
  */

flint/cmd_line_parser.cpp

@@ -644,6 +644,8 @@ void Flint::initCmdParser()
                ' ',
                "<log_file>",
                "Print the burning status to the specified log file");
+    
+    
 
     char flashList[FLASH_LIST_SZ] = {0};
     char flashParDesc[FLASH_LIST_SZ * 2];

flint/subcommands.cpp

@@ -2339,6 +2339,7 @@ FlintStatus QuerySubCommand::printInfo(const fw_info_t& fwInfo, bool fullQuery)
     else if (_flintParams.skip_rom_query) {
         printf("Rom Info:              type=UEFI version=skipped cpu=skipped\n");
         printf("                       type=PXE version=skipped devid=skipped cpu=skipped\n");
+        printf("                       type=NVMe version=skipped devid=skipped cpu=skipped\n");
     }
 
     if (isFs2) {