Merge branch 'master_devel'

Signed-off-by: Adham Masarwah <[email protected]>

Author: adham-mellanox

Makefile.am

@@ -30,7 +30,7 @@
 # SOFTWARE.
 #--
 
-SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts mtcr_ul mtcr_py $(MAD_IFC) reg_access cmdif dev_mgt tools_res_mgmt mflash fw_comps_mgr mlxconfig mlxfwops cmdparser flint small_utils mstdump
+SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts mtcr_ul 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 
 
 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
 

autogen.sh

@@ -6,7 +6,7 @@ test -d config || mkdir config
 sh gitversion.sh ./common/gitversion.h
 
 set -x
-aclocal -I config
+aclocal -I config -I m4
 libtoolize --force --copy
 autoheader
 automake --foreign --add-missing --copy

cmdif/cmdif.py

@@ -1,15 +1,33 @@
 
-#--
-#                 - Mellanox Confidential and Proprietary -
+# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
 #
-# Copyright (C) Jan 2013, Mellanox Technologies Ltd.  ALL RIGHTS RESERVED.
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
 #
-# Except as specifically permitted herein, no portion of the information,
-# including but not limited to object code and source code, may be reproduced,
-# modified, distributed, republished or otherwise exploited in any form or by
-# any means for any purpose without the prior written permission of Mellanox
-# Technologies Ltd. Use of software subject to the terms and conditions
-# detailed in the file "LICENSE.txt".
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 #--
 
 import os

cmdif/icmd_cif_macros.h

@@ -56,16 +56,21 @@ int convert_rc(int rc);
 #define SEND_ICMD_FLOW_GENERIC(mf, op, struct_name, cmd_struct, should_pack, skip_write, pack_func, unpack_func)\
     int _rc;\
     int _cmd_size = struct_name##_size();\
-    u_int8_t _data[_cmd_size];\
-    memset(_data, 0, _cmd_size);\
+    u_int8_t *_data = (u_int8_t *)malloc(sizeof(u_int8_t) * _cmd_size);\
+    if (!_data) {\
+        return GCIF_STATUS_NO_MEM;\
+    }\
+    memset(_data, 0, sizeof(u_int8_t) * _cmd_size);\
     if (should_pack) {\
         pack_func(cmd_struct, _data);\
     }\
     _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write);\
     if (_rc) {\
+        free(_data);\
         return convert_rc(_rc);\
     }\
     unpack_func(cmd_struct, _data);\
+    free(_data);\
     return GCIF_STATUS_SUCCESS
 
 #define SEND_ICMD_FLOW(mf, op, struct_name, cmd_struct, should_pack, skip_write)\
@@ -74,16 +79,21 @@ int convert_rc(int rc);
 #define SEND_UNION_ICMD_FLOW(mf, op, struct_name, cmd_struct, should_pack, skip_write)\
     int _rc;\
     int _cmd_size = struct_name##_size();\
-    u_int8_t _data[_cmd_size];\
-    memset(_data, 0, _cmd_size);\
+    u_int8_t *_data = (u_int8_t *)malloc(sizeof(u_int8_t) * _cmd_size);\
+    if (!_data) {\
+        return GCIF_STATUS_NO_MEM;\
+    }\
+    memset(_data, 0, sizeof(u_int8_t) * _cmd_size);\
     if (should_pack) {\
         struct_name##_in_pack(&(cmd_struct->in), _data);\
     }\
     _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write);\
     if (_rc) {\
+        free(_data);\
         return convert_rc(_rc);\
     }\
     struct_name##_unpack(cmd_struct, _data);\
+    free(_data);\
     return GCIF_STATUS_SUCCESS
 
 

cmdif/tools_cif.c

@@ -50,7 +50,7 @@
 #define QPC_WRITE_OP 0x69
 
 #define CHECK_RC(rc) \
-    if (rc) return rc;
+    if (rc) return (MError)rc;
 
 #define BE32_TO_CPU(s, n) do {                                          \
 	u_int32_t i;                                                   \
@@ -122,7 +122,7 @@ MError tcif_qpc_context_write(mfile* dev, u_int32_t qpn, u_int32_t source, u_int
 
 MError tcif_hw_access(mfile* dev, u_int64_t key, int lock_unlock)
 {
-    return tools_cmdif_send_inline_cmd(dev, key, NULL, 0, HW_ACCESS_OP, lock_unlock);
+    return (MError)tools_cmdif_send_inline_cmd(dev, key, NULL, 0, HW_ACCESS_OP, lock_unlock);
 }
 const char* tcif_err2str(MError rc) {
     return m_err2str(rc);
@@ -135,7 +135,7 @@ MError tcif_cr_mbox_supported(mfile* dev)
     (void)dev;
     return ME_NOT_IMPLEMENTED;
 #else
-    return tools_cmdif_is_cr_mbox_supported(dev);
+    return (MError)tools_cmdif_is_cr_mbox_supported(dev);
 #endif
 
 }

configure.ac

@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(mstflint, 4.7.0, [email protected])
+AC_INIT(mstflint, 4.8.0, [email protected])
 
 AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
 AC_SUBST([PROJECT])
 
-AC_DEFINE_UNQUOTED([VERSION], ["4.7.0"], [Define the project version.])
+AC_DEFINE_UNQUOTED([VERSION], ["4.8.0"], [Define the project version.])
 AC_SUBST([VERSION])
 
 AC_CONFIG_AUX_DIR(config)
@@ -23,6 +23,7 @@ dnl Checks for headers
 AC_CHECK_HEADER(termios.h,[CXXFLAGS="${CXXFLAGS} -DHAVE_TERMIOS_H"])
 TOOLS_CRYPTO=""
 MAD_IFC=""
+MLXFWUPDATE=""
 
 COMPILER_FPIC="-fPIC"
 AC_SUBST(COMPILER_FPIC)
@@ -38,14 +39,35 @@ if test "$enable_dc" = "yes"; then
   AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency]))
 fi
 
+# FWMANAGER
+AC_MSG_CHECKING(--enable-fw-mgr argument)
+AC_ARG_ENABLE(fw-mgr,
+             [  --enable-fw-mgr        Enable compiling mstfwmanager tool and features],
+             [enable_fw_mgr="yes"],
+             [enable_fw_mgr="no"])
+AC_MSG_RESULT($enable_fw_mgr)
+if test "x$enable_fw_mgr" = "xyes"; then
+    AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . this header is needed for compiling fw manager tool]))
+    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_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function.]))
+    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
+
+AC_SUBST(CURL_INC_DIR)
+
+AM_CONDITIONAL(ENABLE_FWMGR, [test "x$enable_fw_mgr" = "xyes" ])
+AC_SUBST(ENABLE_FWMGR)
+
+AC_SUBST(ENABLE_FWMGR)
 # XML2
 AC_MSG_CHECKING(--enable-xml2 argument)
 AC_ARG_ENABLE(xml2,
             [  --enable-xml2           Enable mstflint libxml2 dependant features],
             [enable_xml2="yes"],
             [enable_xml2="no"])
 AC_MSG_RESULT($enable_xml2)
-if test "x$enable_xml2" = "xyes"; then
+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])
@@ -57,6 +79,7 @@ if test "x$enable_xml2" = "xyes"; then
     AC_CHECK_LIB(xml2, xmlDocDumpFormatMemoryEnc,, AC_MSG_ERROR([cannot find xml2 xmlDocDumpFormatMemoryEnc() function. Try re-installing the library...]))
     AC_SUBST(XML2_INC_DIR)
 fi
+
 AM_CONDITIONAL(DISABLE_XML2, [test  "x$enable_xml2" = "xno"])
 AC_SUBST(DISABLE_XML2)
 
@@ -126,13 +149,12 @@ CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
 
 AC_CONFIG_FILES( mstflint.spec )
 
-AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_openssl" = "xyes"], [
-        AC_CONFIG_FILES(tools_crypto/Makefile)
-    ])
-    
-AS_IF([test "x$enable_openssl" = "xyes"], [
-        AC_CONFIG_FILES(mlxsign_lib/Makefile)
-    ])
+#Check for new ignore flags needed for GCC >= 7
+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"], [], [])
+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-format-overflow], [CXXFLAGS="$CXXFLAGS -Wno-format-overflow"], [], [])
+
 
 TOOLS_BUILD_TIME=`date  +"%b %d %Y\, %H:%M:%S"`
 AC_SUBST(TOOLS_BUILD_TIME)
@@ -149,8 +171,28 @@ if test x"$TOOLS_GIT_SHA" == x; then
 fi
 AC_SUBST(TOOLS_GIT_SHA)
 
+AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_openssl" = "xyes"], [
+        AC_CONFIG_FILES(tools_crypto/Makefile)
+    ])
+    
+AS_IF([test "x$enable_openssl" = "xyes"], [
+        AC_CONFIG_FILES(mlxsign_lib/Makefile)
+    ])
+
+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(ext_libs/iniParser/Makefile)
+        AC_CONFIG_FILES(ext_libs/json/Makefile)
+        AC_CONFIG_FILES(ext_libs/minixz/Makefile)
+        MLXFWUPDATE="libmfa xz_utils mlxfwupdate"
+    ])
+    
+AC_SUBST(MLXFWUPDATE)
+
 AC_OUTPUT( Makefile common/Makefile mft_utils/Makefile mtcr_ul/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 mstdump/Makefile mstdump/crd_lib/Makefile mstdump/crd_main/Makefile mstdump/mstdump_dbs/Makefile \
+ 		small_utils/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,10 @@
+mstflint (4.8.0-1) unstable; urgency=low
+
+  * Updated from MFT-4.8.0
+
+ -- Adham Masarwah <adham@unknown>  Wed, 18 Oct 2017 17:52:33 +0200
+
+
 mstflint (4.7.0-1) unstable; urgency=low
 
   * Updated from MFT-4.7.0

dev_mgt/dev_mgt.py

@@ -1,14 +1,32 @@
-#--
-#                 - Mellanox Confidential and Proprietary -
+# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
 #
-# Copyright (C) Jan 2013, Mellanox Technologies Ltd.  ALL RIGHTS RESERVED.
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
 #
-# Except as specifically permitted herein, no portion of the information,
-# including but not limited to object code and source code, may be reproduced,
-# modified, distributed, republished or otherwise exploited in any form or by
-# any means for any purpose without the prior written permission of Mellanox
-# Technologies Ltd. Use of software subject to the terms and conditions
-# detailed in the file "LICENSE.txt".
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 #--
 
 import os

ext_libs/Makefile.am

@@ -33,5 +33,7 @@
 # Makefile.am -- Process this file with automake to produce Makefile.in
 
 SUBDIRS = muparser sqlite
-
+if ENABLE_FWMGR
+SUBDIRS += iniParser minixz json
+endif
 

ext_libs/iniParser/AUTHORS

@@ -0,0 +1,4 @@
+Author: Nicolas Devillard <[email protected]>
+
+Many thanks to the many people who contributed ideas, code, suggestions,
+corrections, enhancements.