diff options
author | Jaakko Heinonen <jh@FreeBSD.org> | 2009-11-03 19:05:05 +0000 |
---|---|---|
committer | Jaakko Heinonen <jh@FreeBSD.org> | 2009-11-03 19:05:05 +0000 |
commit | 4586315a7665712af5da18220337831ddfc7ce5d (patch) | |
tree | f58bfce80caf80e224d7c9b3002a90fa00b18920 /sys/dev/fdc/fdc.c | |
parent | 9144dd07ad6be6faa96d0c59a97df15d151beef7 (diff) | |
download | src-4586315a7665712af5da18220337831ddfc7ce5d.tar.gz src-4586315a7665712af5da18220337831ddfc7ce5d.zip |
fdc(4) module unload fixes:
- Tear down the interrupt handler before killing the worker thread.
- Do geom withering as GEOM event to avoid acquiring the GEOM topology
lock under Giant.
PR: kern/104079
Reviewed by: joerg
Approved by: trasz (mentor)
Notes
Notes:
svn path=/head/; revision=198857
Diffstat (limited to 'sys/dev/fdc/fdc.c')
-rw-r--r-- | sys/dev/fdc/fdc.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 3ff31fd7c3b1..458c839bff2c 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -1734,6 +1734,10 @@ fdc_detach(device_t dev) if ((error = bus_generic_detach(dev))) return (error); + if (fdc->fdc_intr) + bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr); + fdc->fdc_intr = NULL; + /* kill worker thread */ mtx_lock(&fdc->fdc_mtx); fdc->flags |= FDC_KTHREAD_EXIT; @@ -2031,15 +2035,22 @@ fd_attach(device_t dev) return (0); } +static void +fd_detach_geom(void *arg, int flag) +{ + struct fd_data *fd = arg; + + g_topology_assert(); + g_wither_geom(fd->fd_geom, ENXIO); +} + static int fd_detach(device_t dev) { struct fd_data *fd; fd = device_get_softc(dev); - g_topology_lock(); - g_wither_geom(fd->fd_geom, ENXIO); - g_topology_unlock(); + g_waitfor_event(fd_detach_geom, fd, M_WAITOK, NULL); while (device_get_state(dev) == DS_BUSY) tsleep(fd, PZERO, "fdd", hz/10); callout_drain(&fd->toffhandle); |