Merge pull request #1426 from Mellanox/cherry-pick-commits-master

Cherry pick commits master [mstflint-4.34.0-2]

Author: ahmadawwad

dev_mgt/tools_dev_types.c

@@ -49,6 +49,12 @@
 #include "tools_dev_types.h"
 #include "mflash/mflash_types.h"
 #include "mtcr_ul/mtcr_ul_com.h"
+#ifdef CABLES_SUPPORT
+#include "mtcr_ul/mtcr_cables.h"
+#endif
+
+/* Forward declaration to ensure read_device_id is visible */
+int read_device_id(mfile* mf, u_int32_t* device_id);
 
 struct device_info {
     dm_dev_id_t      dm_id;

mflash/mflash.c

@@ -144,6 +144,7 @@ int flash_init_fw_access(mflash* mfl, flash_params_t* flash_params);
 int mf_get_secure_host(mflash* mfl, int* mode);
 int mf_secure_host_op(mflash* mfl, u_int64_t key, int op);
 int cntx_sst_get_log2size(u_int8_t density, int* log2spi_size);
+int cntx_mx25k16xxx_get_log2size(u_int8_t density, int* log2spi_size);
 /* NOTE: This macro returns ... not nice. */
 #define CHECK_RC(rc)   \
     do                 \
@@ -510,11 +511,32 @@ int cntx_sst_get_log2size(u_int8_t density, int* log2spi_size)
     return 0;
 }
 
+int cntx_mx25k16xxx_get_log2size(u_int8_t density, int* log2spi_size)
+{
+    switch (density)
+    {
+        case 0x3a:
+        case 0x20:
+            *log2spi_size = 0x1a;
+            break;
+
+        default:
+            *log2spi_size = density;
+            break;
+    }
+    return MFE_OK;
+}
+
+
 int get_log2size_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, int* log2size)
 {
     if ((type == FMT_SST_25) && (vendor == FV_SST)) {
         return cntx_sst_get_log2size(density, log2size);
     }
+    if (type == FMT_SST_25 && vendor == FV_MX25K16XXX)
+    {
+        return cntx_mx25k16xxx_get_log2size(density, log2size);
+    }
     // In some flashes, the value is 20, but the correct value should be 0x1A. It cannot be 0x20 because 2^20 would overflow an integer.
     if(density == 0x20) {
         *log2size = 0x1a;