diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-05 15:14:10 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-26 19:10:52 -0500 |
commit | 1646a6f352a6f70fcca828589ed04797aa09d494 (patch) | |
tree | 7f39f32e75140e831c26dd57caa7c28515252053 /drivers/net/ethernet/sfc/falcon.c | |
parent | f70d1847348e9548a9a56e4434946315bca297c8 (diff) |
sfc: Clean up test interrupt handling
Interrupts are normally generated by the event queues, moderated by
timers. However, they may also be triggered by detection of a 'fatal'
error condition (e.g. memory parity error) or by the host writing to
certain CSR fields as part of a self-test.
The IRQ level/index used for these on Falcon rev B0 and Siena is set
by the KER_INT_LEVE_SEL field and cached by the driver in
efx_nic::fatal_irq_level. Since this value is also relevant to
self-tests rename the field to just 'irq_level'.
Avoid unnecessary cache traffic by using a per-channel 'last_irq_cpu'
field and only writing to the per-controller field when the interrupt
matches efx_nic::irq_level. Remove the volatile qualifier and use
ACCESS_ONCE in the places we read these fields.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/falcon.c')
-rw-r--r-- | drivers/net/ethernet/sfc/falcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c index b4e91edec0fa..98285115df10 100644 --- a/drivers/net/ethernet/sfc/falcon.c +++ b/drivers/net/ethernet/sfc/falcon.c | |||
@@ -189,9 +189,9 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) | |||
189 | falcon_irq_ack_a1(efx); | 189 | falcon_irq_ack_a1(efx); |
190 | 190 | ||
191 | if (queues & 1) | 191 | if (queues & 1) |
192 | efx_schedule_channel(efx_get_channel(efx, 0)); | 192 | efx_schedule_channel_irq(efx_get_channel(efx, 0)); |
193 | if (queues & 2) | 193 | if (queues & 2) |
194 | efx_schedule_channel(efx_get_channel(efx, 1)); | 194 | efx_schedule_channel_irq(efx_get_channel(efx, 1)); |
195 | return IRQ_HANDLED; | 195 | return IRQ_HANDLED; |
196 | } | 196 | } |
197 | /************************************************************************** | 197 | /************************************************************************** |