diff options
author | njl <njl@FreeBSD.org> | 2003-04-17 20:32:06 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-04-17 20:32:06 +0000 |
commit | fe07eb9dfb67dec3b9867ee376a889a70b355179 (patch) | |
tree | 3cf87a7e7fce73f14cb753a6554ec38575d14502 /sys/pci/if_xl.c | |
parent | 9aba79052e570949849c1985ff95ff264ff272ec (diff) | |
download | FreeBSD-src-fe07eb9dfb67dec3b9867ee376a889a70b355179.zip FreeBSD-src-fe07eb9dfb67dec3b9867ee376a889a70b355179.tar.gz |
Revise attach/detach resource cleanup
- Unconditionally call *_stop() if device is in the tree. This is to
prevent callouts from happening after the device is gone. Checks for
bus_child_present() should be added in the future to keep from touching
potentially non-existent hardware in *_detach(). Found by iedowse@.
- Always check for and free miibus children, even if the device is not in
the tree since some failure cases could have gotten here.
- Call ether_ifdetach() in the irq setup failure case
- ti(4), xl(4): move ifmedia_init() calls to the beginning of attach so
that ifmedia_removeall() can be unconditionally called on detach. There
is no way to detect whether ifmedia has been initialized without using
a separate variable (as tl(4) does).
- Add comments to indicate assumptions of code path
Diffstat (limited to 'sys/pci/if_xl.c')
-rw-r--r-- | sys/pci/if_xl.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index eeb635d..8e6756f 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -1308,6 +1308,7 @@ xl_attach(dev) mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); + ifmedia_init(&sc->ifmedia, 0, xl_ifmedia_upd, xl_ifmedia_sts); sc->xl_flags = 0; if (pci_get_device(dev) == TC_DEVICEID_HURRICANE_555) @@ -1625,9 +1626,6 @@ xl_attach(dev) /* * Do ifmedia setup. */ - - ifmedia_init(&sc->ifmedia, 0, xl_ifmedia_upd, xl_ifmedia_sts); - if (sc->xl_media & XL_MEDIAOPT_BT) { if (bootverbose) printf("xl%d: found 10baseT\n", sc->xl_unit); @@ -1726,10 +1724,12 @@ done: */ ether_ifattach(ifp, eaddr); + /* Hook interrupt last to avoid having to lock softc */ error = bus_setup_intr(dev, sc->xl_irq, INTR_TYPE_NET, xl_intr, sc, &sc->xl_intrhand); if (error) { printf("xl%d: couldn't set up irq\n", unit); + ether_ifdetach(ifp); goto fail; } @@ -1740,6 +1740,13 @@ fail: return(error); } +/* + * Shutdown hardware and free up resources. This can be called any + * time after the mutex has been initialized. It is called in both + * the error case in attach and the normal detach case so it needs + * to be careful about only freeing resources that have actually been + * allocated. + */ static int xl_detach(dev) device_t dev; @@ -1761,16 +1768,16 @@ xl_detach(dev) res = SYS_RES_IOPORT; } + /* These should only be active if attach succeeded */ if (device_is_alive(dev)) { - if (bus_child_present(dev)) { - xl_reset(sc); - xl_stop(sc); - } + xl_reset(sc); + xl_stop(sc); ether_ifdetach(ifp); - device_delete_child(dev, sc->xl_miibus); - bus_generic_detach(dev); - ifmedia_removeall(&sc->ifmedia); } + if (sc->xl_miibus) + device_delete_child(dev, sc->xl_miibus); + bus_generic_detach(dev); + ifmedia_removeall(&sc->ifmedia); if (sc->xl_intrhand) bus_teardown_intr(dev, sc->xl_irq, sc->xl_intrhand); |