Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc7a3a1 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: Invalid Image CSUM bit changed for I217 



On I217, the bit that indicates an invalid EEPROM (NVM) image checksum has
changed from previous ICH/PCH LOMs.  When validating the EEPROM checksum,
check the appropriate bit on different devices.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 635ab564

drivers/net/ethernet/intel/e1000e/defines.h

+4 −0
Original line number Diff line number Diff line
@@ -639,6 +639,10 @@ 
/* NVM Word Offsets */

#define NVM_COMPAT                 0x0003

#define NVM_ID_LED_SETTINGS        0x0004

#define NVM_FUTURE_INIT_WORD1      0x0019

#define NVM_COMPAT_VALID_CSUM      0x0001

#define NVM_FUTURE_INIT_WORD1_VALID_CSUM	0x0040



#define NVM_INIT_CONTROL2_REG      0x000F

#define NVM_INIT_CONTROL3_PORT_B   0x0014

#define NVM_INIT_3GIO_3            0x001A

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

+21 −8
Original line number Diff line number Diff line
@@ -2949,19 +2949,32 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw) 
{

	s32 ret_val;

	u16 data;

	u16 word;

	u16 valid_csum_mask;



	/* Read 0x19 and check bit 6.  If this bit is 0, the checksum

	 * needs to be fixed.  This bit is an indication that the NVM

	 * was prepared by OEM software and did not calculate the

	 * checksum...a likely scenario.

	/* Read NVM and check Invalid Image CSUM bit.  If this bit is 0,

	 * the checksum needs to be fixed.  This bit is an indication that

	 * the NVM was prepared by OEM software and did not calculate

	 * the checksum...a likely scenario.

	 */

	ret_val = e1000_read_nvm(hw, 0x19, 1, &data);

	switch (hw->mac.type) {

	case e1000_pch_lpt:

		word = NVM_COMPAT;

		valid_csum_mask = NVM_COMPAT_VALID_CSUM;

		break;

	default:

		word = NVM_FUTURE_INIT_WORD1;

		valid_csum_mask = NVM_FUTURE_INIT_WORD1_VALID_CSUM;

		break;

	}



	ret_val = e1000_read_nvm(hw, word, 1, &data);

	if (ret_val)

		return ret_val;



	if (!(data & 0x40)) {

		data |= 0x40;

		ret_val = e1000_write_nvm(hw, 0x19, 1, &data);

	if (!(data & valid_csum_mask)) {

		data |= valid_csum_mask;

		ret_val = e1000_write_nvm(hw, word, 1, &data);

		if (ret_val)

			return ret_val;

		ret_val = e1000e_update_nvm_checksum(hw);