mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-21 11:13:30 +00:00
Code Issues Releases Activity

sfxge: Remove interrupt self-test code

Browse Source 
It's not currently used; it didn't build on 32-bit and the previous build fix
is incorrect.  If we really implement self-tests we can do this again
properly.

Submitted by:	Ben Hutchings <bwh -at- solarflare.com>
MFC after:	3 weeks
This commit is contained in:
Philip Paeps 2011-11-19 09:16:52 +00:00
parent 02602e0ebb
commit 76a869385c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=227700
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/sfxge/sfxge.h
View File

@ -144,7 +144,6 @@ struct sfxge_intr {
int n_alloc;
int type;
efsys_mem_t status;
uint64_t mask;
uint32_t zero_count;
};

27
sys/dev/sfxge/sfxge_intr.c
View File

@ -65,15 +65,9 @@ sfxge_intr_line_filter(void *arg)
KASSERT(intr->type == EFX_INTR_LINE,
("intr->type != EFX_INTR_LINE"));
if (intr->state != SFXGE_INTR_STARTED &&
intr->state != SFXGE_INTR_TESTING)
if (intr->state != SFXGE_INTR_STARTED)
return FILTER_STRAY;
if (intr->state == SFXGE_INTR_TESTING) {
intr->mask |= 1; /* only one interrupt */
return FILTER_HANDLED;
}
(void)efx_intr_status_line(enp, &fatal, &qmask);
if (fatal) {
@ -137,21 +131,9 @@ sfxge_intr_message(void *arg)
KASSERT(intr->type == EFX_INTR_MESSAGE,
("intr->type != EFX_INTR_MESSAGE"));
if (intr->state != SFXGE_INTR_STARTED &&
intr->state != SFXGE_INTR_TESTING)
if (intr->state != SFXGE_INTR_STARTED)
return;
if (intr->state == SFXGE_INTR_TESTING) {
uint64_t mask;
do {
mask = intr->mask;
} while (atomic_cmpset_ptr(&intr->mask, mask,
mask | (1 << index)) == 0);
return;
}
(void)efx_intr_status_message(enp, index, &fatal);
if (fatal) {
@ -447,7 +429,6 @@ sfxge_intr_stop(struct sfxge_softc *sc)
intr->state = SFXGE_INTR_INITIALIZED;
/* Disable interrupts at the NIC */
intr->mask = 0;
efx_intr_disable(sc->enp);
/* Disable interrupts at the bus */
@ -480,13 +461,11 @@ sfxge_intr_start(struct sfxge_softc *sc)
if ((rc = sfxge_intr_bus_enable(sc)) != 0)
goto fail;
intr->state = SFXGE_INTR_TESTING;
intr->state = SFXGE_INTR_STARTED;
/* Enable interrupts at the NIC */
efx_intr_enable(sc->enp);
intr->state = SFXGE_INTR_STARTED;
return (0);
fail: