Commit 0c9a39b2 authored Oct 21, 2021 by Edwin Peer Committed by Zheng Zengkai Oct 21, 2021

bnxt_en: fix stored FW_PSID version masks

stable inclusion
from stable-5.10.68
commit 72450231845518503833b8cc1892f44e59dd10e3
bugzilla: 182671 https://gitee.com/openeuler/kernel/issues/I4EWUH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=72450231845518503833b8cc1892f44e59dd10e3



--------------------------------

[ Upstream commit 1656db67 ]

The FW_PSID version components are 8 bits wide, not 4.

Fixes: db28b6c7 ("bnxt_en: Fix devlink info's stored fw.psid version format.")
Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Acked-by: Weilong Chen <chenweilong@huawei.com>

Signed-off-by: Chen Jun <chenjun102@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 26d2f875

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -474,8 +474,8 @@ static int bnxt_dl_info_get(struct devlink dl, struct devlink_info_req req,
		if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {
		u32 ver = nvm_cfg_ver.vu32;

		sprintf(buf, "%d.%d.%d", (ver >> 16) & 0xf, (ver >> 8) & 0xf,
		ver & 0xf);
		sprintf(buf, "%d.%d.%d", (ver >> 16) & 0xff, (ver >> 8) & 0xff,
		ver & 0xff);
		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,
		DEVLINK_INFO_VERSION_GENERIC_FW_PSID,
		buf);