aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/selftest.h
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2011-11-04 23:06:04 +0000
committerBen Hutchings <bhutchings@solarflare.com>2012-01-27 00:10:51 +0000
commit0fb53faa2e6fe67a76b8cfc6eb70a88d9d623648 (patch)
tree7e764db050defe7bec474e4266c5d3dd45a45766 /drivers/net/ethernet/sfc/selftest.h
parentsfc: Correct interrupt timer quantum for Siena (normal and turbo mode) (diff)
downloadlinux-dev-0fb53faa2e6fe67a76b8cfc6eb70a88d9d623648.tar.xz
linux-dev-0fb53faa2e6fe67a76b8cfc6eb70a88d9d623648.zip
sfc: Remove dependence on NAPI polling in efx_test_eventq_irq()
We cannot safely assume that the NAPI handler will complete within the 20 ms that we allow for the event self-test. The handler may be deferred for longer than this, particularly on realtime kernels. Instead, check whether either an event has been handled or (as in the old failure path) whether an interrupt has been received and an event has been delivered but not yet handled. Use napi_disable() to synchronize with the NAPI handler before checking, since it will clear events before updating eventq_read_ptr. Remove the test result chan.N.eventq.poll, since it is not an error if the NAPI handler does not run during the test. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/selftest.h')
-rw-r--r--drivers/net/ethernet/sfc/selftest.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/selftest.h b/drivers/net/ethernet/sfc/selftest.h
index dba5456e70f3..87abe2a53846 100644
--- a/drivers/net/ethernet/sfc/selftest.h
+++ b/drivers/net/ethernet/sfc/selftest.h
@@ -37,7 +37,6 @@ struct efx_self_tests {
int interrupt;
int eventq_dma[EFX_MAX_CHANNELS];
int eventq_int[EFX_MAX_CHANNELS];
- int eventq_poll[EFX_MAX_CHANNELS];
/* offline tests */
int registers;
int phy_ext[EFX_MAX_PHY_TESTS];