Merge branch 'master_devel'

Conflicts:
	kernel/mstflint_kernel.spec
	mstflint.spec.in
	small_utils/congestion.cpp
	small_utils/congestion.h
	tools_layouts/reg_access_hca_layouts.c
	tools_layouts/reg_access_hca_layouts.h

Author: DanGoldbergMellanox

Makefile.am

@@ -30,9 +30,9 @@
 # SOFTWARE.
 #--
 
-SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr mlxconfig mlxfwops cmdparser $(MLXFWUPDATE) flint small_utils mstdump 
+SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump 
 
-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_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
 
 EXTRA_DIST = \
 	mstflint.spec \

cmdif/cmdif.py

@@ -92,11 +92,11 @@ def sendCmd(self, opcode, data, skipWrite):
             self.mstDev.icmdSendCmd(opcode, data, skipWrite)
 
         ##########################
-        def setItrace(self, mask, level):
+        def setItrace(self, mask, level, log_delay=0):
             class ITRACE_ST(Structure):
-                _fields_ = [("unit_mask", c_uint32), ("log_level", c_uint8)]
+                _fields_ = [("unit_mask", c_uint32), ("log_level", c_uint8), ("log_delay", c_uint16)]
 
-            setItraceStruct = pointer(ITRACE_ST(mask, level))
+            setItraceStruct = pointer(ITRACE_ST(mask, level, log_delay))
             rc = self.setItraceFunc(self.mstDev.mf, setItraceStruct)
             if rc:
                 raise CmdIfException("Failed to set itrace mask: %s (%d)" % (self.errStrFunc(rc), rc))

cmdif/icmd_cif_open.h

@@ -43,6 +43,8 @@ extern "C" {
 #include <tools_layouts/icmd_layouts.h>
 #else
 #include <tools_layouts/connectib_layouts.h>
+#include <tools_layouts/connectx4_layouts.h>
+#include "cib_cif.h"
 #endif
 #include "icmd_cif_common.h"
 
@@ -54,10 +56,16 @@ extern "C" {
 
 enum {
     GET_FW_INFO = 0x8007,
-    GET_ICMD_QUERY_CAP = 0x8400,
     FLASH_REG_ACCESS = 0x9001,
+};
+
+#ifdef MST_UL
+// instead of cib_cif.h in mstflint
+enum {
+    GET_ICMD_QUERY_CAP = 0x8400,
     SET_ITRACE = 0xf003,
 };
+#endif
 
 int gcif_get_fw_info(mfile *mf,
                      OUT struct connectib_icmd_get_fw_info *fw_info);

common/Makefile.am

@@ -38,7 +38,7 @@ update_prefix = sed -e 's,[@]MST_LIB_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(libdir)
                     -e 's,[@]MST_BIN_DIR[@]${CONF_DISABLE_PATH_UPDATE},$(bindir),g'\
                     -e 's,[@]MFTCONF_PREFIX[@],$(prefix),g'
 
-update_tools_version = sed -e 's,[@]MFT_VERSION_STR[@],${MFT_VERSION_STR},g' \
+update_tools_version = sed -e 's,[@]MSTFLINT_VERSION_STR[@],${MSTFLINT_VERSION_STR},g' \
      	          	-e 's,[@]TOOLS_BUILD_TIME[@],${TOOLS_BUILD_TIME},g' \
                     -e 's,[@]TOOLS_GIT_SHA[@],${TOOLS_GIT_SHA},g'
 

common/tools_version.h

@@ -41,21 +41,25 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+    #ifndef MSTFLINT_VERSION_STR
+        #define MSTFLINT_VERSION_STR PACKAGE_STRING
+    #endif
+
+    #ifndef TOOLS_GIT_SHA
+        #define TOOLS_GIT_SHA "6469M"
+    #endif
+#else
 // To be replaced by an external script:
 #include "gitversion.h"
 #ifndef TOOLS_GIT_SHA
     #define TOOLS_GIT_SHA "6469M"
 #endif
-
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-    #ifndef MFT_VERSION_STR
-        #define MFT_VERSION_STR PACKAGE_STRING
-    #endif
 #endif
 
-#ifndef MFT_VERSION_STR
-    #define MFT_VERSION_STR "mft V.V.V-R"
+#ifndef MSTFLINT_VERSION_STR
+    #define MSTFLINT_VERSION_STR "mstflint V.V.V-R"
 #endif
 
 static inline
@@ -72,7 +76,7 @@ int get_version_string(char *buf, int buf_size, const char *exe_name, const char
     }
     // cut out first and last "$" from the SVN version string:
     len += snprintf(buf + len, buf_size - len, "%s, built on %s, %s. Git SHA Hash: %s",
-                    MFT_VERSION_STR,
+                    MSTFLINT_VERSION_STR,
                     __DATE__,
                     __TIME__,
                     TOOLS_GIT_SHA);

common/tools_version.py.in

@@ -31,7 +31,7 @@
 
 # To be replaced by an external script:
 TOOLS_GIT_SHA="@TOOLS_GIT_SHA@"
-MFT_VERSION_STR="@MFT_VERSION_STR@"
+MSTFLINT_VERSION_STR="@MSTFLINT_VERSION_STR@"
 TOOLS_BUILD_TIME="@TOOLS_BUILD_TIME@"
 
 ####################################################################
@@ -43,7 +43,7 @@ def GetVersionString(execName, toolVersion = None):
 	else:
 		res = "%s %s, " % (execName,toolVersion)
 
-	res += "%s, built on %s. Git SHA Hash: %s" % (MFT_VERSION_STR, TOOLS_BUILD_TIME, TOOLS_GIT_SHA)
+	res += "%s, built on %s. Git SHA Hash: %s" % (MSTFLINT_VERSION_STR, TOOLS_BUILD_TIME, TOOLS_GIT_SHA)
 	return res;
 ####################################################################
 def PrintVersionString(execName, toolVersion = None):

configure.ac

@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(mstflint, 4.10.0, [email protected])
+AC_INIT(mstflint, 4.11.0, [email protected])
 
 AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
 AC_SUBST([PROJECT])
 
-AC_DEFINE_UNQUOTED([VERSION], ["4.10.0"], [Define the project version.])
+AC_DEFINE_UNQUOTED([VERSION], ["4.11.0"], [Define the project version.])
 AC_SUBST([VERSION])
 
 AC_CONFIG_AUX_DIR(config)
@@ -28,6 +28,8 @@ if test "x$OS" = "xFreeBSD"; then
     AC_MSG_NOTICE(FreeBSD Build)
     MTCR_CONF_DIR="mtcr_freebsd"
     default_en_inband="no"
+    CXXFLAGS="${CXXFLAGS} -isystem /usr/local/include"
+    LDFLAGS="${LDFLAGS} -L/usr/local/lib"
 else
     MTCR_CONF_DIR="mtcr_ul"
     LDL="-ldl"
@@ -41,7 +43,7 @@ dnl Checks for headers
 AC_CHECK_HEADER(termios.h,[CXXFLAGS="${CXXFLAGS} -DHAVE_TERMIOS_H"])
 TOOLS_CRYPTO=""
 MAD_IFC=""
-MLXFWUPDATE=""
+FW_MGR_TOOLS=""
 
 COMPILER_FPIC="-fPIC"
 AC_SUBST(COMPILER_FPIC)
@@ -67,8 +69,8 @@ AC_MSG_RESULT($enable_fw_mgr)
 if test "x$enable_fw_mgr" = "xyes"; then
     AC_CHECK_HEADER(curl/curl.h,,AC_MSG_ERROR([cannot find curl/curl.h . this header is needed for compiling fw manager tool]))
     AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . this header is needed for compiling fw manager tool]))
-    AC_CHECK_HEADER(lzma.h,,AC_MSG_ERROR([cannot find lzma.h . this header is needed for compiling fw manager tool]))
     AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function.]))
+    AC_CHECK_HEADER(lzma.h,,AC_MSG_ERROR([Cannot find lzma.h.]))
     AC_CHECK_LIB(boost_regex, regcompA,, AC_MSG_ERROR([cannot find boost_regex regcompA() function. Try re-installing the library...]))
     CURL_INC_DIR=/usr/include/curl/
 fi
@@ -130,11 +132,11 @@ if test "x$enable_cs" = "xyes"; then
   TOOLS_CRYPTO="tools_crypto"
 fi
 
-AC_MSG_CHECKING(--enable-openssl argument)
+AC_MSG_CHECKING(--disable-openssl argument)
 AC_ARG_ENABLE(openssl,
-            [  --enable-openssl       Enable all openssl features, dependant of openssl library],
-            [enable_openssl="yes"],
-            [enable_openssl="no"])
+            [  --disable-openssl       Disable all openssl features, dependant of openssl library],
+            [enable_openssl=$enableval],
+            [enable_openssl="yes"])
 AC_MSG_RESULT($enable_openssl)
 if test "x$enable_openssl" = "xyes"; then
   AC_CHECK_HEADER(openssl/sha.h,,AC_MSG_ERROR([cannot find openssl/sha.h . remove --enable-openssl to remove this dependaency or install openssl]))
@@ -163,38 +165,56 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
   LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
 ])
 
-CFLAGS="$CFLAGS -Werror -DMST_UL"
-CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
+CFLAGS="$CFLAGS -DMST_UL"
+CXXFLAGS="$CXXFLAGS -DMST_UL"
+
+AM_CFLAGS="-Wall -Werror"
+AM_CXXFLAGS="-Wall -Werror"
 
 AC_CONFIG_FILES( mstflint.spec )
 
+# We save and restore CFLAGS, after adding Wall and Werror
+# because AX_CHECK_COMPILE_FLAG doesn't work properly without it
+
 # C related ignores
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Werror"
 AX_CHECK_COMPILE_FLAG([-Wno-format-overflow], [CFLAGS="$CFLAGS -Wno-format-overflow"], [], [])
 AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implicit-fallthrough"], [], [])
 AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CFLAGS="$CFLAGS -Wno-cast-function-type"], [], [])
+CFLAGS="$OLD_CFLAGS"
 
 # C++ related ignores
+OLD_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -Wall -Werror"
 AC_LANG_PUSH([C++])
 AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"], [], [])
 AX_CHECK_COMPILE_FLAG([-Wno-format-overflow], [CXXFLAGS="$CXXFLAGS -Wno-format-overflow"], [], [])
 AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CXXFLAGS="$CXXFLAGS -Wno-cast-function-type"], [], [])
 AX_CHECK_COMPILE_FLAG([-Wno-class-memaccess], [CXXFLAGS="$CXXFLAGS -Wno-class-memaccess"], [], [])
 AC_LANG_POP([C++])
+CXXFLAGS="$OLD_CXXFLAGS"
 
 TOOLS_BUILD_TIME=`date  +"%b %d %Y\, %H:%M:%S"`
 AC_SUBST(TOOLS_BUILD_TIME)
 
-AC_ARG_VAR(MFT_VERSION_STR, The MSTFLINT version)
-if test x"$MFT_VERSION_STR" == x; then
-    MFT_VERSION_STR="$PACKAGE_STRING"
+AC_ARG_VAR(MSTFLINT_VERSION_STR, The MSTFLINT version)
+if test x"$MSTFLINT_VERSION_STR" == x; then
+    MSTFLINT_VERSION_STR="$PACKAGE_STRING"
 fi
-AC_SUBST(MFT_VERSION_STR)
+
+AC_SUBST(MSTFLINT_VERSION_STR)
+AC_DEFINE([MSTFLINT_VERSION_STR], [], [The MSTFLINT version])
+AC_DEFINE_UNQUOTED(MSTFLINT_VERSION_STR, "$MSTFLINT_VERSION_STR")
+
 
 AC_ARG_VAR(TOOLS_GIT_SHA, The MSTFLINT tree git sha hash version)
 if test x"$TOOLS_GIT_SHA" == x; then
     TOOLS_GIT_SHA="N/A"
 fi
 AC_SUBST(TOOLS_GIT_SHA)
+AC_DEFINE([TOOLS_GIT_SHA], [], [The MSTFLINT tree git sha hash version])
+AC_DEFINE_UNQUOTED(TOOLS_GIT_SHA, "$TOOLS_GIT_SHA")
 
 AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_openssl" = "xyes"], [
         AC_CONFIG_FILES(tools_crypto/Makefile)
@@ -205,18 +225,14 @@ AS_IF([test "x$enable_openssl" = "xyes"], [
     ])
 
 AS_IF([test "x$enable_fw_mgr" = "xyes"], [
-        AC_CONFIG_FILES(mlxfwupdate/Makefile)
-        AC_CONFIG_FILES(libmfa/Makefile)
         AC_CONFIG_FILES(xz_utils/Makefile)
+        AC_CONFIG_FILES(mlxfwupdate/Makefile)
         AC_CONFIG_FILES(ext_libs/iniParser/Makefile)
-        AC_CONFIG_FILES(ext_libs/json/Makefile)
-        AC_CONFIG_FILES(ext_libs/minixz/Makefile)
-        MLXFWUPDATE="libmfa xz_utils mlxfwupdate"
+        AC_CONFIG_FILES(mlxarchive/Makefile)
+        FW_MGR_TOOLS="xz_utils mlxfwupdate mlxarchive"
     ])
 
-AC_SUBST(MLXFWUPDATE)
-
-
+AC_SUBST(FW_MGR_TOOLS)
 
 if test "x$OS" = "xFreeBSD"; then
     AC_MSG_NOTICE(FreeBSD MTCR)
@@ -226,8 +242,8 @@ else
     AC_CONFIG_FILES(mtcr_ul/Makefile)
 fi
 
-AC_OUTPUT( Makefile common/Makefile mft_utils/Makefile mtcr_py/Makefile ext_libs/Makefile ext_libs/sqlite/Makefile ext_libs/muparser/Makefile dev_mgt/Makefile tools_layouts/Makefile reg_access/Makefile \
-        cmdif/Makefile tools_res_mgmt/Makefile mlxconfig/Makefile mlxconfig/mlxconfig_dbs/Makefile mflash/Makefile mlxfwops/Makefile mlxfwops/lib/Makefile cmdparser/Makefile flint/Makefile \
- 		small_utils/Makefile small_utils/mlxfwresetlib/Makefile mstdump/Makefile mstdump/crd_lib/Makefile mstdump/crd_main/Makefile mstdump/mstdump_dbs/Makefile mvpd/Makefile \
- 		 fw_comps_mgr/Makefile mad_ifc/Makefile )
+AC_OUTPUT( Makefile common/Makefile mft_utils/Makefile mtcr_py/Makefile ext_libs/Makefile ext_libs/sqlite/Makefile ext_libs/muparser/Makefile ext_libs/json/Makefile ext_libs/minixz/Makefile dev_mgt/Makefile \
+        tools_layouts/Makefile reg_access/Makefile cmdif/Makefile libmfa/Makefile tools_res_mgmt/Makefile mlxconfig/Makefile mlxconfig/mlxconfig_dbs/Makefile mflash/Makefile mlxfwops/Makefile mlxfwops/lib/Makefile cmdparser/Makefile flint/Makefile \
+        small_utils/Makefile small_utils/mlxfwresetlib/Makefile mstdump/Makefile mstdump/crd_lib/Makefile mstdump/crd_main/Makefile mstdump/mstdump_dbs/Makefile mvpd/Makefile \
+        fw_comps_mgr/Makefile mad_ifc/Makefile )
 

debian/changelog

@@ -1,3 +1,9 @@
+mstflint (4.11.0-1) unstable; urgency=low
+
+  * Updated from MFT-4.11.0. Added new tools: mlxarchive and mstprivhost.
+
+ -- Dan Goldberg <dang@unknown>  Wed, 21 Nov 2018 16:00:00 +0200
+
 mstflint (4.10.0-1) unstable; urgency=low
 
   * Updated from MFT-4.10.0

dev_mgt/tools_dev_types.c

@@ -45,6 +45,7 @@
 #include <errno.h>
 #include <reg_access/reg_access.h>
 #include "tools_dev_types.h"
+#include "mflash/mflash_types.h"
 
 enum dm_dev_type {
     DM_UNKNOWN = -1,
@@ -65,10 +66,10 @@ struct device_info {
     enum dm_dev_type dev_type;
 };
 
-#define DEVID_ADDR                          0xf0014
-#define CABLEID_ADDR                        0x0
-#define SFP_51_ADDR                         92
-#define SFP_51_PAGING_ADDR                  64
+#define DEVID_ADDR                                             0xf0014
+#define CABLEID_ADDR                                           0x0
+#define SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR     92
+#define SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR                  64
 
 #ifdef CABLES_SUPP
 enum dm_dev_type getCableType(u_int8_t id)
@@ -276,7 +277,7 @@ static struct device_info g_devs_info[] = {
         -1,                     //hw_rev_i
         -1,                     //sw_dev_i
         "Spectrum2",            //name
-        64,                     //port_num
+        128,                    //port_num
         DM_SWITCH               //dev_type
     },
     {
@@ -297,6 +298,15 @@ static struct device_info g_devs_info[] = {
         80,                     //port_num
         DM_SWITCH               //dev_type
     },
+    {
+        DeviceSecureHost,       //dm_id
+        0xcafe,                 //hw_dev_i
+        0xd0,                   //hw_rev_i
+        0,                      //sw_dev_i
+        "Unknown Device",       //name
+        -1,                     //port_num
+        DM_UNKNOWN              //dev_type
+    },
     {
         DeviceUnknown,          //dm_id
         0,                      //hw_dev_i
@@ -366,7 +376,7 @@ int dm_get_device_id(mfile *mf,
         u_int8_t id = EXTRACT(dword, 0, 8);
         enum dm_dev_type cbl_type = getCableType(id);
         if (cbl_type == DM_QSFP_CABLE) {
-            // Get Byte 2 bit 2 ~ bit 18
+            // Get Byte 2 bit 2 ~ bit 18 (flat_mem : upper memory flat or paged. 0=paging, 1=page 0 only)
             u_int8_t paging = EXTRACT(dword, 18, 1);
             //printf("DWORD: %#x, paging: %d\n", dword, paging);
             if (paging == 0) {
@@ -376,18 +386,18 @@ int dm_get_device_id(mfile *mf,
             }
         } else if (cbl_type == DM_SFP_CABLE) {
             *ptr_dm_dev_id = DeviceCableSFP;
-            if (mread4(mf, SFP_51_ADDR, &dword) != 4) {
+            if (mread4(mf, SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR, &dword) != 4) {
                 //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
                 return 1;
             }
-            u_int8_t byte = EXTRACT(dword, 6, 1); //Byte 92 bit 6
+            u_int8_t byte = EXTRACT(dword, 6, 1); //Byte 92 bit 6 (digital diagnostic monitoring implemented)
             if (byte) {
                 *ptr_dm_dev_id = DeviceCableSFP51;
-                if (mread4(mf, SFP_51_PAGING_ADDR, &dword) != 4) {
+                if (mread4(mf, SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR, &dword) != 4) {
                     //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
                     return 1;
                 }
-                byte = EXTRACT(dword, 4, 1); //Byte 64 bit 4
+                byte = EXTRACT(dword, 4, 1); //Byte 64 bit 4 (paging implemented indicator)
                 if (byte) {
                     *ptr_dm_dev_id = DeviceCableSFP51Paging;
                 }
@@ -429,7 +439,7 @@ int dm_get_device_id(mfile *mf,
         }
     } else {
         if (mread4(mf, DEVID_ADDR, &dword) != 4) {
-            //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
+            printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
             return 1;
         }
 
@@ -442,8 +452,8 @@ int dm_get_device_id(mfile *mf,
     if (*ptr_dm_dev_id == DeviceUnknown) {
 
         /* Dev id not matched in array */
-        //printf("FATAL - Can't find devid id\n");
-        return 1; // TODO - fix return vals.
+        printf("FATAL - Can't find device id.\n");
+        return MFE_UNSUPPORTED_DEVICE;
     }
     return 0;
 }
@@ -453,7 +463,7 @@ int dm_get_device_id_offline(u_int32_t devid,
                              dm_dev_id_t *ptr_dev_type)
 {
     *ptr_dev_type = get_entry_by_dev_rev_id(devid, chip_rev)->dm_id;
-    return *ptr_dev_type == DeviceUnknown;
+    return *ptr_dev_type == DeviceUnknown ? MFE_UNSUPPORTED_DEVICE: MFE_OK;
 }
 
 const char* dm_dev_type2str(dm_dev_id_t type)