Merge branch 'master_devel'

Author: kstntnm

adb_parser/adb_parser.cpp

@@ -1872,13 +1872,34 @@ string Adb::evalExpr(string expr, AttrsMap *vars) {
         string vvalue;
         regex singleVar("^[a-zA-Z_][a-zA-Z0-9_]*$");
 
+        //Need to change to array-like initialization when we'll move to c++11
+        vector<string> specialVars;
+        specialVars.push_back("NAME");
+        specialVars.push_back("ARR_IDX");
+        specialVars.push_back("BN");
+        specialVars.push_back("parent");
+
         if (regex_search(vname, what2, singleVar)) {
-            AttrsMap::iterator it = vars->find(vname);
-            if (it == vars->end()) {
-                throw AdbException("Can't find the variable: " + vname);
+            if (find(specialVars.begin(), specialVars.end(), vname) == specialVars.end()) {
+                return expr;
+            } else {
+                AttrsMap::iterator it = vars->find(vname);
+                if (it == vars->end()) {
+                    throw AdbException("Can't find the variable: " + vname);
+                }
+                vvalue = it->second;
             }
-            vvalue = it->second;
         } else {
+            string vnameCopy = vname;
+            regex singleVarInExpr("[a-zA-Z_][a-zA-Z0-9_]*");
+            smatch matches;
+            while (regex_search(vnameCopy, matches, singleVarInExpr)) {
+                if (find(specialVars.begin(), specialVars.end(), matches[0]) == specialVars.end()) {
+                    return expr;
+                }
+                vnameCopy = matches.suffix();
+            }
+
             char exp[vname.size() + 1];
             char *expPtr = exp;
             strcpy(exp, vname.c_str());
@@ -2499,10 +2520,15 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
 void AdbParser::includeAllFilesInDir(AdbParser *adbParser, string dirPath,
         int lineNumber) {
     vector < string > paths;
+    boost::filesystem::path mainFile(adbParser->_fileName);
     boost::algorithm::split(paths, dirPath, boost::is_any_of(string(";")));
-
     for (StringVector::iterator pathIt = paths.begin(); pathIt != paths.end(); pathIt++) {
-        boost::filesystem::path fsPath(*pathIt);
+        //first look in the main file's path
+        boost::filesystem::path fsPath (mainFile.parent_path().string() + "/" + *pathIt);
+        if (!boost::filesystem::exists(fsPath)) {
+            fsPath = boost::filesystem::path(*pathIt);
+        }
+
         if (boost::filesystem::exists(fsPath)
                 && boost::filesystem::is_directory(fsPath)) {
                     addIncludePaths(adbParser->_adbCtxt, *pathIt);

adb_parser/adb_parser.h

@@ -201,7 +201,6 @@ class AdbInstance {
     bool operator<(const AdbInstance& other);
     bool isConditionalNode();
     bool isConditionValid(map<string, string> *valuesMap);
-
     // DB like access methods
     AdbInstance
     * getChildByPath(const string& path, bool isCaseSensitive = true);
@@ -234,7 +233,6 @@ class AdbInstance {
     u_int32_t arrIdx;
     AdbInstance *unionSelector; // For union instances only
     bool isDiff;
-
     // FOR USER USAGE
     void *userData;
 private:

cmdif/cmdif.py

@@ -154,7 +154,10 @@ def multiHostSyncStatus(self):
 
         ##########################
         class QUERY_CAP_ST(Structure):
-            _fields_ = [("virtual_link_down",                      c_uint8),
+            _fields_ = [("golden_tlv_version",                     c_uint8),
+                        ("cwcam_reg",                              c_uint8),
+                        ("capability_groups",                      c_uint8),
+                        ("virtual_link_down",                      c_uint8),
                         ("icmd_exmb",                              c_uint8),
                         ("capi",                                   c_uint8),
                         ("qcam_reg",                               c_uint8),
@@ -173,7 +176,8 @@ class QUERY_CAP_ST(Structure):
                         ("wol_s",                                  c_uint8),
                         ("rol_g",                                  c_uint8),
                         ("rol_s",                                  c_uint8),
-                        ("fpga",                                   c_uint8)]
+                        ("fpga",                                   c_uint8),
+                        ("num_of_diagnostic_counters",             c_uint16)]
 
         ##########################
         def isMultiHostSyncSupported(self):

cmdif/icmd_cif_open.c

@@ -54,9 +54,10 @@ int gcif_get_fw_info(mfile *mf,
 /*
  * get_icmd_query_cap
  */
-int get_icmd_query_cap(mfile *mf, struct connectx4_icmd_query_cap_general *icmd_query_caps)
+int get_icmd_query_cap(mfile *mf, struct icmd_hca_icmd_query_cap_general *icmd_query_caps)
 {
-    SEND_ICMD_FLOW(mf, GET_ICMD_QUERY_CAP, connectx4_icmd_query_cap_general, icmd_query_caps, 1, 0);
+    SEND_ICMD_FLOW(mf, GET_ICMD_QUERY_CAP, icmd_hca_icmd_query_cap_general,
+                   icmd_query_caps, 1, 0);
 }
 
 int gcif_mh_sync(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync)
@@ -75,7 +76,3 @@ int gcif_set_itrace(mfile *mf, struct connectib_itrace *itrace)
     SEND_ICMD_FLOW(mf, SET_ITRACE, connectib_itrace, itrace, 1, 0);
 }
 
-int gcif_set_port_sniffer(mfile *mf, struct connectib_icmd_set_port_sniffer *set_port_sniffer)
-{
-    SEND_ICMD_FLOW(mf, SET_PORT_SNIFFER, connectib_icmd_set_port_sniffer, set_port_sniffer, 1, 0);
-}

cmdif/icmd_cif_open.h

@@ -44,6 +44,7 @@ extern "C" {
 #else
 #include <tools_layouts/connectib_layouts.h>
 #include <tools_layouts/connectx4_layouts.h>
+#include <tools_layouts/icmd_hca_layouts.h>
 #include "cib_cif.h"
 #endif
 #include "icmd_cif_common.h"
@@ -64,20 +65,19 @@ enum {
 enum {
     GET_ICMD_QUERY_CAP = 0x8400,
     SET_ITRACE = 0xf003,
-    SET_PORT_SNIFFER = 0xc002,
 };
 #endif
 
 int gcif_get_fw_info(mfile *mf,
                      OUT struct connectib_icmd_get_fw_info *fw_info);
 
-int get_icmd_query_cap(mfile *mf, struct connectx4_icmd_query_cap_general *icmd_query_caps);
+int get_icmd_query_cap(mfile *mf,
+                       struct icmd_hca_icmd_query_cap_general *icmd_query_caps);
 
 int gcif_mh_sync(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync);
 
 int gcif_mh_sync_status(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync);
 
-int gcif_set_port_sniffer(mfile *mf, struct connectib_icmd_set_port_sniffer *set_port_sniffer);
 
 #ifdef __cplusplus
 }

cmdparser/cmdparser.cpp

@@ -575,7 +575,12 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
             }
         }
         if (ignore_this_req == false) {
-            curr_result = p_req->HandleOption(long_opt_name, (tools_optarg == NULL) ? "" : tools_optarg);
+            try{
+                curr_result = p_req->HandleOption(long_opt_name, (tools_optarg == NULL) ? "" : tools_optarg);
+            }catch (std::exception){
+                this->SetLastError("Failed to handle option %s", long_opt_name.c_str());
+                goto parse_exit;
+            }
             if (curr_result) {
                 rc = curr_result;
                 this->SetLastError("Failed to handle option %s", long_opt_name.c_str());

common/compatibility.h

@@ -40,6 +40,52 @@
 
 #include <stdio.h>
 
+#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__)
+    #define U64L       "l"
+#else
+    #define U64L       "ll"
+#endif
+
+
+/* define macros to the architecture of the CPU */
+#if defined(__linux__) || defined(__FreeBSD__)
+#   if defined(__i386__)
+#       define ARCH_x86
+#   elif defined(__x86_64__)
+#       define ARCH_x86_64
+#   elif defined(__ia64__)
+#       define ARCH_ia64
+#   elif defined(__PPC64__) || defined(__s390x__)
+#       define ARCH_ppc64
+#   elif defined(__PPC__)
+#       define ARCH_ppc
+#   elif defined(__aarch64__)
+#       define ARCH_arm64
+#   elif defined(__arm__)
+#       define ARCH_arm6l
+#   else
+#       error Unknown CPU architecture using the linux OS
+#   endif
+#elif defined(__MINGW32__) || defined(__MINGW64__)              /* Windows MINGW */
+#   if defined(__MINGW32__)
+#       define ARCH_x86
+#   elif defined(__MINGW64__)
+#       define ARCH_x86_64
+#   else
+#       error Unknown CPU architecture using the windows-mingw OS
+#   endif
+#elif defined(_WIN32) || defined(_WIN64)                /* Windows */
+#   if defined(_WIN32)
+#       define ARCH_x86
+#   elif defined(_WIN64)
+#       define ARCH_x86_64
+#   else
+#       error Unknown CPU architecture using the windows OS
+#   endif
+#else                                                   /* Unknown */
+#   error Unknown OS
+#endif
+
 /* define macros for print fields */
 #define U32D_FMT    "%u"
 #define U32H_FMT    "0x%08x"
@@ -48,33 +94,30 @@
 #define U16H_FMT    "0x%04x"
 #define U8H_FMT     "0x%02x"
 
-#if defined(__linux) || defined(__FreeBSD__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
-#    include <stdint.h>
-#    include <inttypes.h>
-#    if defined(PRId64) && defined(PRIx64)
-#       define U64D_FMT    "%" PRId64
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
+#   if defined(__MINGW32__) || defined(__MINGW64__)
+#       include <inttypes.h>
+#       define U64D_FMT    "0x%" PRId64
 #       define U64H_FMT    "0x%" PRIx64
-#       define U64H_FMT_GEN PRIx64
+#       define U64H_FMT_GEN "" PRIx64
 #       define U48H_FMT    "0x%" PRIx64
-#       define U64D_FMT_GEN PRId64
-#    elif defined(__MINGW32__) || defined(_WIN32) || defined(__i386__) || defined(__PPC__) || defined(UEFI_BUILD) || defined(__arm__)
-#       define U64L       "ll"
+#       define U64D_FMT_GEN "" PRId64
+#   else
 #       define U64D_FMT     "%llu"
 #       define U64H_FMT     "0x%016llx"
 #       define U64H_FMT_GEN "llx"
 #       define U48H_FMT     "0x%012llx"
 #       define U64D_FMT_GEN "llu"
-#   else
-#       define U64L       "l"
-#       define U64D_FMT     "%lu"
-#       define U64H_FMT     "0x%016lx"
-#       define U48H_FMT     "0x%012lx"
-#       define U64H_FMT_GEN "lx"
-#       define U64D_FMT_GEN "lu"
 #   endif
+#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
+#    define U64D_FMT     "%lu"
+#    define U64H_FMT     "0x%016lx"
+#    define U48H_FMT     "0x%012lx"
+#    define U64H_FMT_GEN "lx"
+#    define U64D_FMT_GEN "lu"
 #else
-#   error Unknown OS or Architecture
-#endif
+#   error Unknown architecture
+#endif  /* ARCH */
 
 /*
  * Only for architectures which can't do swab by themselves
@@ -386,7 +429,7 @@ typedef uint8_t u_int8_t;
     #include <inttypes.h>
 #endif
 
-#if defined(__VMKERNEL_UW_VMKLINUX__) || defined(__VMKERNEL_UW_NATIVE__)
+#if defined(__VMKERNEL_UW_NATIVE__)
     #define ROOT_PATH "/opt/mellanox/"
 #else
     #define ROOT_PATH "/"

common/python_wrapper.sh

@@ -32,4 +32,16 @@ else
     fi
 fi
 
-exec $PYTHON_EXEC $MSTFLINT_PYTHON_TOOLS/$EXEC_NAME/${EXEC_NAME}.py "$@"
+SCRIPT_PATH=$MSTFLINT_PYTHON_TOOLS/${EXEC_NAME}/${EXEC_NAME}.py
+
+if test ! -f $SCRIPT_PATH; then
+    SCRIPT_PATH=$(find $MSTFLINT_PYTHON_TOOLS -name ${EXEC_NAME}.py)
+fi
+
+if test -z "${SCRIPT_PATH=}"; then
+    >&2 echo "-E- Couldn't find ${EXEC_NAME}.py"
+    exit 2
+fi
+
+exec $PYTHON_EXEC $SCRIPT_PATH "$@"
+

configure.ac

@@ -31,12 +31,12 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(mstflint, 4.15.0, [email protected])
+AC_INIT(mstflint, 4.16.0, [email protected])
 
 AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
 AC_SUBST([PROJECT])
 
-AC_DEFINE_UNQUOTED([VERSION], ["4.15.0"], [Define the project version.])
+AC_DEFINE_UNQUOTED([VERSION], ["4.16.0"], [Define the project version.])
 AC_SUBST([VERSION])
 
 AC_CONFIG_MACRO_DIR([m4])

debian/changelog

@@ -1,3 +1,9 @@
+mstflint (4.16.0-1) unstable; urgency=low
+
+  * Updated from MFT-4.16.0
+
+ -- Kostiantyn Maksatov <kostiantynm@unknown>  Thu, 17 Dec 2020 04:58:33 +0300
+
 mstflint (4.15.0-1) unstable; urgency=low
 
   * Ported ConnectX6Dx EFUSE programming from MFT 4.16.0