[Pkg-ofed-commits] [mstflint] 06/13: Imported Upstream version 4.1.0+1.46.gb1cdaf7
Mehdi Dogguy
mehdi at moszumanska.debian.org
Thu Dec 31 19:02:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository mstflint.
commit 366ec6ea97b19bad6291bc71baa92dc996de7aa6
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Thu Dec 31 01:11:04 2015 +0100
Imported Upstream version 4.1.0+1.46.gb1cdaf7
---
common/gitversion.h | 2 +-
mlxconfig/mlxcfg_param_lib.cpp | 2 +-
mlxfwops/lib/fs3_ops.cpp | 6 ++--
mstdump/mstdump_dbs/ConnectX4LX.csv | 61 ++-----------------------------------
mstflint.spec | 4 +--
small_utils/vpd.c | 4 +--
6 files changed, 11 insertions(+), 68 deletions(-)
diff --git a/common/gitversion.h b/common/gitversion.h
index 0f3c1a7..6842909 100644
--- a/common/gitversion.h
+++ b/common/gitversion.h
@@ -1 +1 @@
-#define TOOLS_GIT_SHA "1d75d01"
+#define TOOLS_GIT_SHA "b1cdaf7"
diff --git a/mlxconfig/mlxcfg_param_lib.cpp b/mlxconfig/mlxcfg_param_lib.cpp
index 93d56e0..d5481ee 100644
--- a/mlxconfig/mlxcfg_param_lib.cpp
+++ b/mlxconfig/mlxcfg_param_lib.cpp
@@ -2501,7 +2501,7 @@ bool PrebootBootSettingsParams4thGen::cfgSupported(mfile* mf, mlxCfgParam param)
if (rc) {
return false;
}
- return portParams.nv_config_boot_parameters;
+ return true; //portParams.nv_config_boot_parameters; <--BUG fw is not updating this bit, assume supported if query_def_params command passess
}
void PrebootBootSettingsParams4thGen::setParam(mlxCfgParam paramType, u_int32_t val)
diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
index c0fbccc..f60cdb6 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
@@ -1084,7 +1084,7 @@ bool Fs3Operations::Fs3Burn(Fs3Operations &imageOps, ExtBurnParams& burnParams)
// image vsd patch
if (!burnParams.useImagePs && burnParams.vsdSpecified ) {
// get image info section :
- struct toc_info *imageInfoToc;
+ struct toc_info *imageInfoToc = (struct toc_info *)NULL;
if (!imageOps.Fs3GetItocInfo(imageOps._fs3ImgInfo.tocArr, imageOps._fs3ImgInfo.numOfItocs, FS3_IMAGE_INFO, imageInfoToc)){
return errmsg(MLXFW_GET_SECT_ERR, "failed to get Image Info section.");
}
@@ -1757,7 +1757,7 @@ bool Fs3Operations::Fs3GetNewSectionAddr(struct toc_info *curr_toc, u_int32_t &N
if (failsafe_section) {// we assume dev_info is the only FS section.
// get the two dev_info addresses (section is failsafe) according to the location of the mfg section
- toc_info* toc;
+ toc_info* toc = (toc_info*) NULL;
u_int32_t devInfoAddr1 = 0;
u_int32_t devInfoAddr2 = 0;
@@ -1848,7 +1848,7 @@ bool Fs3Operations::Fs3ReburnItocSection(u_int32_t newSectionAddr,
//add callback if we want info during section update
bool Fs3Operations::Fs3UpdateSection(void *new_info, fs3_section_t sect_type, bool is_sect_failsafe, CommandType cmd_type, PrintCallBack callBackFunc)
{
- struct toc_info *curr_toc;
+ struct toc_info *curr_toc = (struct toc_info *)NULL;
std::vector<u_int8_t> newUidSection;
u_int32_t newSectionAddr;
const char *type_msg;
diff --git a/mstdump/mstdump_dbs/ConnectX4LX.csv b/mstdump/mstdump_dbs/ConnectX4LX.csv
index b0e5309..0a15268 100644
--- a/mstdump/mstdump_dbs/ConnectX4LX.csv
+++ b/mstdump/mstdump_dbs/ConnectX4LX.csv
@@ -1812,12 +1812,6 @@
0x0d2d40,16,
0x0d2d90,4,
0x0d2dc0,12,
-0x0d2e00,1,
-0x0d2e20,1,
-0x0d2e28,12,
-0x0d2e5c,1,
-0x0d2e80,6,
-0x0d2f00,14,
0x0d3000,2,
0x0d3400,1,
0x0d3428,1,
@@ -1884,56 +1878,6 @@
0x0d4e94,5,
0x0d4eac,1,
0x0d4eb4,3,
-0x0d5000,29,
-0x0d5078,4,
-0x0d5090,2,
-0x0d50a0,7,
-0x0d50c0,11,
-0x0d5100,14,
-0x0d5140,14,
-0x0d5180,61,
-0x0d5278,4,
-0x0d5290,2,
-0x0d52a0,7,
-0x0d52c0,11,
-0x0d5300,14,
-0x0d5340,14,
-0x0d5380,61,
-0x0d5478,4,
-0x0d5490,2,
-0x0d54a0,7,
-0x0d54c0,11,
-0x0d5500,14,
-0x0d5540,14,
-0x0d5580,61,
-0x0d5678,4,
-0x0d5690,2,
-0x0d56a0,7,
-0x0d56c0,11,
-0x0d5700,14,
-0x0d5740,14,
-0x0d5780,69,
-0x0d5c00,6,
-0x0d5c40,14,
-0x0d5c80,9,
-0x0d5d00,9,
-0x0d5d2c,1,
-0x0d5d40,3,
-0x0d5d60,1,
-0x0d5d80,3,
-0x0d5e00,2,
-0x0d5e0c,1,
-0x0d5e14,5,
-0x0d5e2c,1,
-0x0d5e34,5,
-0x0d5e4c,1,
-0x0d5e54,5,
-0x0d5e6c,1,
-0x0d5e74,5,
-0x0d5e8c,1,
-0x0d5e94,5,
-0x0d5eac,1,
-0x0d5eb4,3,
0x0d6000,15,
0x0d6070,3,
0x0d6080,6,
@@ -1971,7 +1915,7 @@
0x0d6a80,19,
0x0d6ad0,10,
0x0d6c00,19,
-0x0d6c50,10,
+0x0d6c60,6,
0x0d6c84,1,
0x0d6c94,8,
0x0d6cb8,9,
@@ -3016,7 +2960,7 @@
0x11c380,19,
0x11c3d0,10,
0x11c400,19,
-0x11c450,10,
+0x11c460,6,
0x11c484,1,
0x11c494,8,
0x11c4b8,9,
@@ -3174,7 +3118,6 @@
0x11fae0,4,
0x11fc04,8,
0x11fc40,13,
-0x11fc80,16,
0x11fd00,6,
0x11fd20,3,
0x11fd30,3,
diff --git a/mstflint.spec b/mstflint.spec
index 97fa042..d38d908 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -12,12 +12,12 @@
Summary: Mellanox firmware burning application
Name: %{name}
Version: 4.1.0
-Release: 1.45.g1d75d01
+Release: 1.46.gb1cdaf7
License: GPL/BSD
Url: http://openfabrics.org
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-Source: http://www.openfabrics.org/downloads/mstflint-4.1.0-1.45.g1d75d01.tar.gz
+Source: http://www.openfabrics.org/downloads/mstflint-4.1.0-1.46.gb1cdaf7.tar.gz
ExclusiveArch: i386 i486 i586 i686 x86_64 ia64 ppc ppc64 ppc64le arm64 aarch64
BuildRequires: zlib-devel %{ibmadlib}
diff --git a/small_utils/vpd.c b/small_utils/vpd.c
index 44aae36..8cab06c 100644
--- a/small_utils/vpd.c
+++ b/small_utils/vpd.c
@@ -220,8 +220,8 @@ int pci_read_vpd_dword_gw(int fd, int vpd_cap_offset, unsigned offset, unsigned
}
}
- ret = pread(fd, data, sizeof data, vpd_cap_offset + VPD_DATA_OFFSET);
- if (ret != sizeof data) {
+ ret = pread(fd, data, 0x4, vpd_cap_offset + VPD_DATA_OFFSET);
+ if (ret != 0x4) {
return ret;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/mstflint.git
More information about the Pkg-ofed-commits
mailing list