Skip to contentSkip to conversation

e1000: prevent corruption of EEPROM/NVM

PATCH Applied [email protected] 3 participants 3 messages Sep 5, 2008 – Sep 19, 2008

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

PATCH 3/6 e1000: prevent corruption of EEPROM/NVM

From: Christopher Li <[email protected]>

Andrey reports e1000 corruption, and that a patch in vmware's ESX fixed it.

The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.

[[email protected]: use DEFINE_SPINLOCK to avoid confusing lockdep]
Cc Zach Amsden <[email protected]>
Cc Pratap Subrahmanyam <[email protected]>
Cc Jeff Kirsher <[email protected]>
Cc Jesse Brandeburg <[email protected]>
Cc Bruce Allan <[email protected]>
Cc PJ Waskiewicz <[email protected]>
Cc John Ronciak <[email protected]>
Cc Jeff Garzik <[email protected]>

---

 drivers/net/e1000/e1000_hw.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
drivers/net/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c~e1000e-prevent-corruption-of-eeprom-nvm +23 -0
diff -puN drivers/net/e1000/e1000_hw.c~e1000e-prevent-corruption-of-eeprom-nvm drivers/net/e1000/e1000_hw.c
@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(str
 static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);
 static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex);
 static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 
 /* IGP cable length table */
 static const
@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP02
       83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
       104, 109, 114, 118, 121, 124};
 
+static DEFINE_SPINLOCK(e1000_eeprom_lock);
+
 /******************************************************************************
  * Set the phy type member in the hw struct.
  *
@@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct
  *****************************************************************************/
 s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 {
+    s32 ret;
+    spin_lock(&e1000_eeprom_lock);
+    ret = e1000_do_read_eeprom(hw, offset, words, data);
+    spin_unlock(&e1000_eeprom_lock);
+    return ret;
+}
+
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
     u32 i = 0;
 
@@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct 
  *****************************************************************************/
 s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 {
+    s32 ret;
+    spin_lock(&e1000_eeprom_lock);
+    ret = e1000_do_write_eeprom(hw, offset, words, data);
+    spin_unlock(&e1000_eeprom_lock);
+    return ret;
+}
+
+
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
     s32 status = 0;
 

_

#1 lore raw
Quoted 20 lines · [email protected] wrote:

From: Christopher Li <[email protected]>

Andrey reports e1000 corruption, and that a patch in vmware's ESX fixed it.

The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.

[[email protected]: use DEFINE_SPINLOCK to avoid confusing lockdep]
Cc Zach Amsden <[email protected]>
Cc Pratap Subrahmanyam <[email protected]>
Cc Jeff Kirsher <[email protected]>
Cc Jesse Brandeburg <[email protected]>
Cc Bruce Allan <[email protected]>
Cc PJ Waskiewicz <[email protected]>
Cc John Ronciak <[email protected]>
Cc Jeff Garzik <[email protected]>
Quoted 4 lines

---

 drivers/net/e1000/e1000_hw.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

No further reply from Intel to my ping, and this regression needs to be addressed, so, applied.

#2 lore raw
Quoted 22 lines · Jeff Garzik
Quoted 21 lines · [email protected] wrote:

From: Christopher Li <[email protected]>

Andrey reports e1000 corruption, and that a patch in vmware's ESX fixed it.

The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.

[[email protected]: use DEFINE_SPINLOCK to avoid confusing lockdep] Signed-off-by: Christopher Li <[email protected]>

Cc Zach Amsden <[email protected]>
Cc Pratap Subrahmanyam <[email protected]>
Cc Jeff Kirsher <[email protected]>
Cc Jesse Brandeburg <[email protected]>
Cc Bruce Allan <[email protected]>
Cc PJ Waskiewicz <[email protected]>
Cc John Ronciak <[email protected]>
Cc Jeff Garzik <[email protected]>
Quoted 5 lines
Quoted 2 lines
 drivers/net/e1000/e1000_hw.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

No further reply from Intel to my ping, and this regression needs to be addressed, so, applied.

My apologies Jeff. I know it is late, but to close the loop, I agree this is okay, in at least I don't believe it will harm anything, other than adding un-necessary bloat at the worst.