diff options
| author | Jeff Kirsher | 2006-01-13 01:50:32 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-01-17 13:40:10 +0100 |
| commit | 7892f59c5ea86115450293441ca10654168e00da (patch) | |
| tree | 8bb3ee008714f43f1c3542335e2d4ac44032d9ea /drivers | |
| parent | [PATCH] e1000: Fix ASF/AMT for 8257{1|2|3} controllers (diff) | |
| download | kernel-qcow2-linux-7892f59c5ea86115450293441ca10654168e00da.tar.gz kernel-qcow2-linux-7892f59c5ea86115450293441ca10654168e00da.tar.xz kernel-qcow2-linux-7892f59c5ea86115450293441ca10654168e00da.zip | |
[PATCH] e1000: Fix PHY config for 82573 controller
Added a delay to allow PHY configuration to complete before accessing NVM.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_hw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index f853e1064ac0..45fa386d212e 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -6722,6 +6722,12 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw) break; } + /* PHY configuration from NVM just starts after EECD_AUTO_RD sets to high. + * Need to wait for PHY configuration completion before accessing NVM + * and PHY. */ + if (hw->mac_type == e1000_82573) + msec_delay(25); + return E1000_SUCCESS; } |