diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2013-01-03 23:36:57 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 19:48:24 +0100 |
| commit | 1840667a851efb5f719d2c76b235c172104722e8 (patch) | |
| tree | 0fb8df706a5cf5e9e7d0f0afa74372b9783ca6b7 /drivers/net/ethernet/sfc/nic.c | |
| parent | d829118705f8213ffeffa4fefa8931dea6b7f016 (diff) | |
sfc: Limit scope of a Falcon A1 IRQ workaround
We unconditionally acknowledge legacy interrupts just before disabling
them. This workaround is needed on Falcon A1 but probably not on
later chips where the legacy interrupt mechanism is different. It was
also originally done after the IRQ handler was removed, not before.
Restore the original behaviour for Falcon A1 only by doing this
acknowledgement in the efx_nic_type::fini operation.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/nic.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/nic.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index c17d659f4525..2d0a584e1af2 100644 --- a/drivers/net/ethernet/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c @@ -1781,7 +1781,6 @@ int efx_nic_init_interrupt(struct efx_nic *efx) void efx_nic_fini_interrupt(struct efx_nic *efx) { struct efx_channel *channel; - efx_oword_t reg; #ifdef CONFIG_RFS_ACCEL free_irq_cpu_rmap(efx->net_dev->rx_cpu_rmap); @@ -1792,12 +1791,6 @@ void efx_nic_fini_interrupt(struct efx_nic *efx) efx_for_each_channel(channel, efx) free_irq(channel->irq, &efx->msi_context[channel->channel]); - /* ACK legacy interrupt */ - if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) - efx_reado(efx, ®, FR_BZ_INT_ISR0); - else - falcon_irq_ack_a1(efx); - /* Disable legacy interrupt */ if (efx->legacy_irq) free_irq(efx->legacy_irq, efx); |