lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sfc: Remove duplicate hardware structure definitions

Browse Source 
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings
2009-11-29 03:42:10 +00:00
committed by David S. Miller
parent 39e6021208
commit 674979d335
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/sfc/falcon.c
View File

@@ -1463,8 +1463,8 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
/* Determine interrupting queues, clear interrupt status /* Determine interrupting queues, clear interrupt status
* register and acknowledge the device interrupt. * register and acknowledge the device interrupt.
*/ */
BUILD_BUG_ON(INT_EVQS_WIDTH > EFX_MAX_CHANNELS); BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS);
queues = EFX_OWORD_FIELD(*int_ker, INT_EVQS); queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q);
EFX_ZERO_OWORD(*int_ker); EFX_ZERO_OWORD(*int_ker);
wmb(); /* Ensure the vector is cleared before interrupt ack */ wmb(); /* Ensure the vector is cleared before interrupt ack */
falcon_irq_ack_a1(efx); 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)); irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
/* Check to see if we have a serious error condition */ /* 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)) if (unlikely(syserr))
return falcon_fatal_interrupt(efx); return falcon_fatal_interrupt(efx);

12
drivers/net/sfc/regs.h
View File

@@ -3106,18 +3106,6 @@
#define FALCON_STATS_NOT_DONE 0x00000000 #define FALCON_STATS_NOT_DONE 0x00000000
#define FALCON_STATS_DONE 0xffffffff #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 * Falcon non-volatile configuration