d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shut down the card bus bridge hardware on detach. Before we'd just

Browse Source 
free the resoruces w/o actually turning off the interrupts.  This lead
to interrupt storms if you were to insert a card after kldunloading
the driver.
This commit is contained in:
imp 2005-10-29 03:27:43 +00:00
parent 3882c07f39
commit 5fe80693f5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/pccbb/pccbb.c
View File

@ -300,12 +300,18 @@ cbb_detach(device_t brdev)
if (error > 0)
return (ENXIO);
mtx_lock(&sc->mtx);
/*
* XXX do we teardown all the ones still registered to guard against
* XXX buggy client drivers?
*/
bus_teardown_intr(brdev, sc->irq_res, sc->intrhand);
/* Turn off the interrupts */
cbb_set(sc, CBB_SOCKET_MASK, 0);
/* reset 16-bit pcmcia bus */
exca_clrb(&sc->exca[0], EXCA_INTR, EXCA_INTR_RESET);
/* turn off power */
cbb_power(brdev, CARD_OFF);
/* Ack the interrupt */
cbb_set(sc, CBB_SOCKET_EVENT, 0xffffffff);
/*
* Wait for the thread to die. kthread_exit will do a wakeup
* on the event thread's struct thread * so that we know it is
@ -314,6 +320,8 @@ cbb_detach(device_t brdev)
* the event thread happens only in kthread_exit, we don't
* need to loop here.
*/
mtx_lock(&sc->mtx);
bus_teardown_intr(brdev, sc->irq_res, sc->intrhand);
sc->flags |= CBB_KTHREAD_DONE;
if (sc->flags & CBB_KTHREAD_RUNNING) {
cv_broadcast(&sc->cv);