e1000: remove dead e1000_init_eeprom_params calls.
Subsystems (2)
PATCH 1/1 e1000: remove dead e1000_init_eeprom_params calls.
The device probe method e1000_probe calls e1000_init_eeprom_params itself so there's no reason to call it again from e1000_do_write_eeprom or e1000_do_read_eeprom.
The sentence above assumes that e1000_init_eeprom_params is effective. e1000_init_eeprom_params depends mostly on hw->mac_type and e1000_probe bails out early if it can't set mac_type (see e1000_init_hw_struct, then e1000_set_mac_type), qed.
Btw, if effective, the removed paths would had been deadlock prone when e1000_eeprom_spi was set:
-> e1000_write_eeprom (takes e1000_eeprom_lock)
-> e1000_do_write_eeprom
-> e1000_init_eeprom_params
-> e1000_read_eeprom (takes e1000_eeprom_lock)(same narrative with e1000_read_eeprom -> e1000_do_read_eeprom etc.)
As a final note, the candidate deadlock above can't happen in e1000_probe due to the way eeprom->word_size is set / tested.
---
Patch against davem's net-next as of 9dc20a649609c95ce7c5ac4282656ba627b67d49.
I noticed these calls while looking at Joern Engel's e1000 eeprom read/write scheduler friendly patch.
drivers/net/ethernet/intel/e1000/e1000_hw.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_hw.c +0 -8
@@ -3900,10 +3900,6 @@ static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,return E1000_SUCCESS ; } -/* If eeprom is not yet detected, do so now */ -if (eeprom->word_size ==0 ) -e1000_init_eeprom_params (hw); -/* A check for invalid values: offset too large, too many words, and * not enough words. */
@@ -4074,10 +4070,6 @@ static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,return E1000_SUCCESS ; } -/* If eeprom is not yet detected, do so now */ -if (eeprom->word_size ==0 ) -e1000_init_eeprom_params (hw); -/* A check for invalid values: offset too large, too many words, and * not enough words. */
Signature · 1 line
Ueimor
Brown
PATCH 1/1 e1000: remove dead e1000_init_eeprom_params calls.
Quoted 34 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Francois Romieu
Sent: Wednesday, August 05, 2015 3:53 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/1 net-next] e1000: remove deade1000_init_eeprom_paramscalls.The device probe method
e1000_probecallse1000_init_eeprom_paramsitself so there's no reason to call it again frome1000_do_write_eepromore1000_do_read_eeprom.The sentence above assumes that
e1000_init_eeprom_paramsis effective.e1000_init_eeprom_paramsdepends mostly onhw->mac_typeande1000_probebails out early if it can't setmac_type(seee1000_init_hw_struct, thene1000_set_mac_type), qed.Btw, if effective, the removed paths would had been deadlock prone when
e1000_eeprom_spiwas set:
->e1000_write_eeprom(takese1000_eeprom_lock)
->e1000_do_write_eeprom-> e1000_init_eeprom_params -> e1000_read_eeprom (takes e1000_eeprom_lock)(same narrative with
e1000_read_eeprom->e1000_do_read_eeprometc.)As a final note, the candidate deadlock above can't happen in
e1000_probedue to the wayeeprom->word_sizeis set / tested.Signed-off-by Francois Romieu <[email protected]>---
Patch against davem's net-next as of
9dc20a649609c95ce7c5ac4282656ba627b67d49.
Quoted 6 lines
I noticed these calls while looking at Joern Engel's e1000 eeprom
read/write
scheduler friendly patch.drivers/net/ethernet/intel/e1000/e1000_hw.c | 8 -------- 1 file changed, 8 deletions(-)