diff options
| author |   Alexander Duyck <alexander.h.duyck@intel.com> | 2009-10-05 06:35:23 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-06 14:59:23 -0700 |
| commit | ab576389b733b458495529f81839f499b3fece78 (patch) | |
| tree | 3b5728e8d8536bf70e927ea4ce6d16526763518a /drivers/net/igb/e1000_phy.c | |
| parent | igb: move the generic copper link setup code into e1000_phy.c (diff) | |
| download | linux-dev-ab576389b733b458495529f81839f499b3fece78.tar.xz linux-dev-ab576389b733b458495529f81839f499b3fece78.zip | |
igb: add code to retry a phy read in the event of failure on link check
This patch adds a retry to phy reads in the event of failure. The original
code broke out of the loop on failure and this is a mistake as we should be
trying to do the read twice.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_phy.c')
| -rw-r--r-- | drivers/net/igb/e1000_phy.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c index b27275d7ff6d..5fe03e114b83 100644 --- a/drivers/net/igb/e1000_phy.c +++ b/drivers/net/igb/e1000_phy.c @@ -1444,8 +1444,14 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations, * it across the board. */ ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status); - if (ret_val) - break; + if (ret_val) { + /* + * If the first read fails, another entity may have + * ownership of the resources, wait and try again to + * see if they have relinquished the resources yet. + */ + udelay(usec_interval); + } ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status); if (ret_val) break; |