diff options
| author | Steve Hodgson <shodgson@solarflare.com> | 2010-06-01 13:18:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-02 11:21:07 +0200 |
| commit | 901d3fe848d8c34988699592c9f4b98c2ce10a8b (patch) | |
| tree | 4b5e6a1930da8155d131b2ad9c774f929d2d6f21 | |
| parent | sfc: Synchronise link_advertising and wanted_fc on Siena (diff) | |
| download | linux-901d3fe848d8c34988699592c9f4b98c2ce10a8b.tar.xz linux-901d3fe848d8c34988699592c9f4b98c2ce10a8b.zip | |
sfc: Wait for the link to stay up before running loopback selftest
It's been observed that some phys (such as the qt2025c) can
do down-up-down-up transitions, presumably as pcs block lock
settles down.
The loopback selftest will start sending data immediately
after the link comes up. Work around this by waiting for
the link state to stay up for two consecutive polls, rather
than one.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/sfc/selftest.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index 371e86cc090f..52ac14af83a4 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c @@ -545,7 +545,7 @@ efx_test_loopback(struct efx_tx_queue *tx_queue, static int efx_wait_for_link(struct efx_nic *efx) { struct efx_link_state *link_state = &efx->link_state; - int count; + int count, link_up_count = 0; bool link_up; for (count = 0; count < 40; count++) { @@ -567,8 +567,12 @@ static int efx_wait_for_link(struct efx_nic *efx) link_up = !efx->mac_op->check_fault(efx); mutex_unlock(&efx->mac_lock); - if (link_up) - return 0; + if (link_up) { + if (++link_up_count == 2) + return 0; + } else { + link_up_count = 0; + } } return -ETIMEDOUT; |