diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-22 19:23:45 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-22 19:23:45 +0000 |
| commit | e04008c2a60fa14277334a79a52d9dbbcad7fffb (patch) | |
| tree | 1257bc6d9051e24346a0f6fc2cf9196fa07ce267 /sys/dev/pci | |
| parent | de14161c18897daedac87e4bb9c850543563ea75 (diff) | |
re-enable interrupt mitigation and mask out NFE_IRQ_TIMER that was causing
interrupts flood.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_nfe.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_nfereg.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index e4790382cec..956631a2bae 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.45 2006/02/22 03:19:11 brad Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.46 2006/02/22 19:23:44 damien Exp $ */ /*- * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -1072,7 +1072,7 @@ nfe_init(struct ifnet *ifp) tmp = NFE_READ(sc, NFE_PWR_STATE); NFE_WRITE(sc, NFE_PWR_STATE, tmp | NFE_PWR_VALID); -#if 0 +#if 1 /* configure interrupts coalescing/mitigation */ NFE_WRITE(sc, NFE_IMTIMER, NFE_IM_DEFAULT); #else diff --git a/sys/dev/pci/if_nfereg.h b/sys/dev/pci/if_nfereg.h index 5af55b6a4e5..36d131bf6d8 100644 --- a/sys/dev/pci/if_nfereg.h +++ b/sys/dev/pci/if_nfereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfereg.h,v 1.15 2006/02/20 20:19:47 damien Exp $ */ +/* $OpenBSD: if_nfereg.h,v 1.16 2006/02/22 19:23:44 damien Exp $ */ /*- * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> @@ -95,9 +95,13 @@ #define NFE_IRQ_TIMER 0x0020 #define NFE_IRQ_LINK 0x0040 #define NFE_IRQ_TXERR2 0x0080 -#define NFE_IRQ_WANTED 0x00ff #define NFE_IRQ_TX1 0x0100 +#define NFE_IRQ_WANTED \ + (NFE_IRQ_RXERR | NFE_IRQ_RX_NOBUF | NFE_IRQ_RX | \ + NFE_IRQ_TXERR | NFE_IRQ_TXERR2 | NFE_IRQ_TX_DONE | \ + NFE_IRQ_LINK) + #define NFE_RXTX_KICKTX 0x0001 #define NFE_RXTX_BIT1 0x0002 #define NFE_RXTX_BIT2 0x0004 |