Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f70d1847 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

Partly revert "sfc: Handle serious errors in exactly one interrupt handler" 



This reverts commit 63695459 in
drivers/net/ethernet/sfc/falcon.c.

Unlike the INT_ISR0 register on later controller revisions, the
NET_IVEC_INT_Q bits written to memory are only ever set for
interrupting event queues, not for any other interrupt sources.

By definition there can only be one legacy interrupt handler per
function, so there is no need to worry about detecting a fatal
interrupt more than once.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 0fb53faa

drivers/net/ethernet/sfc/falcon.c

+5 −8
Original line number Diff line number Diff line
@@ -174,19 +174,16 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 
		   "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",

		   irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));



	/* Determine interrupting queues, clear interrupt status

	 * register and acknowledge the device interrupt.

	 */

	BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS);

	queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q);



	/* Check to see if we have a serious error condition */

	if (queues & (1U << efx->fatal_irq_level)) {

	syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);

	if (unlikely(syserr))

		return efx_nic_fatal_interrupt(efx);

	}



	/* Determine interrupting queues, clear interrupt status

	 * register and acknowledge the device interrupt.

	 */

	BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS);

	queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q);

	EFX_ZERO_OWORD(*int_ker);

	wmb(); /* Ensure the vector is cleared before interrupt ack */

	falcon_irq_ack_a1(efx);