mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 09:04:57 +00:00
e1000e: Correct NVM checksum verification flow
commitffd24fa2fc
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:4051f68318
("e1000e: Do not take care about recovery NVM checksum") Reported-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> Tested-by: Naama Meir <naamax.meir@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4020d2e14f
commit
a47e7ac885
1 changed files with 2 additions and 2 deletions
|
@ -4136,9 +4136,9 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
|
|||
return ret_val;
|
||||
|
||||
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;
|
||||
ret_val = e1000_write_nvm(hw, word, 1, &data);
|
||||
if (ret_val)
|
||||
|
|
Loading…
Reference in a new issue