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

Commit 674979d3 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Remove duplicate hardware structure definitions 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39e60212

drivers/net/sfc/falcon.c

+3 −3
Original line number Diff line number Diff line
@@ -1463,8 +1463,8 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 
	/* Determine interrupting queues, clear interrupt status

	 * register and acknowledge the device interrupt.

	 */

	BUILD_BUG_ON(INT_EVQS_WIDTH > EFX_MAX_CHANNELS);

	queues = EFX_OWORD_FIELD(*int_ker, INT_EVQS);

	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);
@@ -1500,7 +1500,7 @@ static irqreturn_t falcon_msi_interrupt(int irq, void *dev_id) 
		  irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));



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

	syserr = EFX_OWORD_FIELD(*int_ker, FATAL_INT);

	syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);

	if (unlikely(syserr))

		return falcon_fatal_interrupt(efx);

drivers/net/sfc/regs.h

+0 −12
Original line number Diff line number Diff line
@@ -3106,18 +3106,6 @@ 
#define FALCON_STATS_NOT_DONE 0x00000000

#define FALCON_STATS_DONE 0xffffffff



/* Interrupt status register bits */

#define FATAL_INT_LBN 64

#define FATAL_INT_WIDTH 1

#define INT_EVQS_LBN 40

#define INT_EVQS_WIDTH 4

#define INT_FLAG_LBN 32

#define INT_FLAG_WIDTH 1

#define EVQ_FIFO_HF_LBN 1

#define EVQ_FIFO_HF_WIDTH 1

#define EVQ_FIFO_AF_LBN 0

#define EVQ_FIFO_AF_WIDTH 1



/**************************************************************************

 *

 * Falcon non-volatile configuration