提交 cc3dd405 编写于 作者: S Sasha Neftin 提交者: Zheng Zengkai

e1000e: Correct NVM checksum verification flow

stable inclusion
from stable-v5.10.104
commit eb5e444fe37d467e54d2945c1293f311ce782f67
bugzilla: https://gitee.com/openeuler/kernel/issues/I56XAC

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

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

commit ffd24fa2 upstream.

Update MAC type check e1000_pch_tgp because for e1000_pch_cnp,
NVM checksum update is still possible.
Emit a more detailed warning message.

Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1191663
Fixes: 4051f683 ("e1000e: Do not take care about recovery NVM checksum")
Reported-by: NThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: NSasha Neftin <sasha.neftin@intel.com>
Tested-by: NNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: NTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 2898124e
...@@ -4134,9 +4134,9 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw) ...@@ -4134,9 +4134,9 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
return ret_val; return ret_val;
if (!(data & valid_csum_mask)) { if (!(data & valid_csum_mask)) {
e_dbg("NVM Checksum Invalid\n"); e_dbg("NVM Checksum valid bit not set\n");
if (hw->mac.type < e1000_pch_cnp) { if (hw->mac.type < e1000_pch_tgp) {
data |= valid_csum_mask; data |= valid_csum_mask;
ret_val = e1000_write_nvm(hw, word, 1, &data); ret_val = e1000_write_nvm(hw, word, 1, &data);
if (ret_val) if (ret_val)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册