提交 f5ef017e 编写于 作者: S Sriharsha Basavapatna 提交者: David S. Miller

be2net: NCSI FW section should be properly updated with ethtool for BE3

The driver has a check to ensure that NCSI FW section is updated only
if the current FW version in the card supports it. This FW version check
is done using memcmp() which obviously fails in some cases. Fix this by
breaking up the version string into integer version components and
comparing them.
Signed-off-by: NSriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 6ee080bb
...@@ -2728,6 +2728,26 @@ static int be_flash(struct be_adapter *adapter, const u8 *img, ...@@ -2728,6 +2728,26 @@ static int be_flash(struct be_adapter *adapter, const u8 *img,
return 0; return 0;
} }
#define NCSI_UPDATE_LOG "NCSI section update is not supported in FW ver %s\n"
static bool be_fw_ncsi_supported(char *ver)
{
int v1[4] = {3, 102, 148, 0}; /* Min ver that supports NCSI FW */
int v2[4];
int i;
if (sscanf(ver, "%d.%d.%d.%d", &v2[0], &v2[1], &v2[2], &v2[3]) != 4)
return false;
for (i = 0; i < 4; i++) {
if (v1[i] < v2[i])
return true;
else if (v1[i] > v2[i])
return false;
}
return true;
}
/* For BE2, BE3 and BE3-R */ /* For BE2, BE3 and BE3-R */
static int be_flash_BEx(struct be_adapter *adapter, static int be_flash_BEx(struct be_adapter *adapter,
const struct firmware *fw, const struct firmware *fw,
...@@ -2805,8 +2825,10 @@ static int be_flash_BEx(struct be_adapter *adapter, ...@@ -2805,8 +2825,10 @@ static int be_flash_BEx(struct be_adapter *adapter,
continue; continue;
if ((pflashcomp[i].optype == OPTYPE_NCSI_FW) && if ((pflashcomp[i].optype == OPTYPE_NCSI_FW) &&
memcmp(adapter->fw_ver, "3.102.148.0", 11) < 0) !be_fw_ncsi_supported(adapter->fw_ver)) {
dev_info(dev, NCSI_UPDATE_LOG, adapter->fw_ver);
continue; continue;
}
if (pflashcomp[i].optype == OPTYPE_PHY_FW && if (pflashcomp[i].optype == OPTYPE_PHY_FW &&
!phy_flashing_required(adapter)) !phy_flashing_required(adapter))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册