Skip to contentSkip to conversation

e1000e: Do not take care about recovery NVM checksum

PATCH New Sasha Neftin 2 participants 2 messages Jul 18, 2021 – Aug 8, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 e1000e: Do not take care about recovery NVM checksum

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

---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +11 -7
index 9bae4932a11d..a34010580bfc 100644
@@ -4141,13 +4141,17 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
 		return ret_val;
 
 	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);
-		if (ret_val)
-			return ret_val;
+		e_dbg("NVM Checksum Invalid\n");
+
+		if (hw->mac.type < e1000_pch_cnp) {
+			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);
+			if (ret_val)
+				return ret_val;
+		}
 	}
 
 	return e1000e_validate_nvm_checksum_generic(hw);
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 e1000e: Do not take care about recovery NVM checksum

Quoted 5 lines · Sasha Neftin

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.

Quoted 8 lines

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213667

---
  drivers/net/ethernet/intel/e1000e/ich8lan.c | 18 +++++++++++-------
  1 file changed, 11 insertions(+), 7 deletions(-)