Commit ffd24fa2 authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen
Browse files

e1000e: Correct NVM checksum verification flow 

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: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1866aa0d

drivers/net/ethernet/intel/e1000e/ich8lan.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -4140,9 +4140,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)