From 0e0591858141b3fc2eb5e132a5e71f2d1793fd20 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 12 Jan 2006 16:50:32 -0800
Subject: [PATCH] --- yaml --- r: 18795 b: refs/heads/master c:
 7892f59c5ea86115450293441ca10654168e00da h: refs/heads/master i:   18793:
 37dc57bf6a260148077c00cbf73014962119a5d3   18791:
 fe08acdb9fbaa0afa7666921e453cf0334d6bbdc v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000/e1000_hw.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b0fbd09006d..6cbf8374e6dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39
+refs/heads/master: 7892f59c5ea86115450293441ca10654168e00da
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
index f853e1064ac0..45fa386d212e 100644
--- a/trunk/drivers/net/e1000/e1000_hw.c
+++ b/trunk/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;
 }