xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e1000e: Do not take care about recovery NVM checksum

Browse Source 
[ Upstream commit 4051f68318ca9f3d3becef3b54e70ad2c146df97 ]

On new platforms, the NVM is read-only. Attempting to update the NVM
is causing a lockup to occur. Do not attempt to write to the NVM
on platforms where it's not supported.
Emit an error message when the NVM checksum is invalid.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213667
Fixes: fb776f5d57 ("e1000e: Add support for Tiger Lake")
Suggested-by: Dima Ruinskiy <dima.ruinskiy@intel.com>
Suggested-by: Vitaly Lifshits <vitaly.lifshits@intel.com>
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sasha Neftin
2021-07-18 07:10:31 +03:00
committed by Greg Kroah-Hartman
parent 87285ac51e
commit 8f1e3ad945
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/e1000e/ich8lan.c
View File

@@ -4134,6 +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");
if (hw->mac.type < e1000_pch_cnp) {
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)
@@ -4142,6 +4145,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return ret_val; return ret_val;
} }
}
return e1000e_validate_nvm_checksum_generic(hw); return e1000e_validate_nvm_checksum_generic(hw);
} }