diff options
| author | Emil Tantilov | 2011-02-16 02:38:08 +0100 |
|---|---|---|
| committer | Jeff Kirsher | 2011-03-03 12:04:05 +0100 |
| commit | 48de36c5656113ce6cfe4207da2f90f46917e53d (patch) | |
| tree | 7978a5577a2856684cf3c2c2119b1156e3ace916 /drivers/net/ixgbe/ixgbe_common.c | |
| parent | ixgbe: cleanup code in ixgbe_identify_sfp_module_generic (diff) | |
| download | kernel-qcow2-linux-48de36c5656113ce6cfe4207da2f90f46917e53d.tar.gz kernel-qcow2-linux-48de36c5656113ce6cfe4207da2f90f46917e53d.tar.xz kernel-qcow2-linux-48de36c5656113ce6cfe4207da2f90f46917e53d.zip | |
ixgbe: Check link wants report current link state
Currently check link reports the link state as down, if at any time
the link had previously gone down since the last time the LINKS
register was read. This does not accurately reflect the function of
the check link call, which should be to return the CURRENT link
state. Code now reads the LINKS registers twice, once to clear the
previous and again to get the current value.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_common.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index 6d87c7491d10..7e3bb559f42d 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/drivers/net/ixgbe/ixgbe_common.c @@ -2769,10 +2769,19 @@ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw) s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *link_up, bool link_up_wait_to_complete) { - u32 links_reg; + u32 links_reg, links_orig; u32 i; + /* clear the old state */ + links_orig = IXGBE_READ_REG(hw, IXGBE_LINKS); + links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS); + + if (links_orig != links_reg) { + hw_dbg(hw, "LINKS changed from %08X to %08X\n", + links_orig, links_reg); + } + if (link_up_wait_to_complete) { for (i = 0; i < IXGBE_LINK_UP_TIME; i++) { if (links_reg & IXGBE_LINKS_UP) { |