summaryrefslogtreecommitdiffstats
path: root/sys/pci/if_wb.c
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-04-17 20:32:06 +0000
committernjl <njl@FreeBSD.org>2003-04-17 20:32:06 +0000
commitfe07eb9dfb67dec3b9867ee376a889a70b355179 (patch)
tree3cf87a7e7fce73f14cb753a6554ec38575d14502 /sys/pci/if_wb.c
parent9aba79052e570949849c1985ff95ff264ff272ec (diff)
downloadFreeBSD-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_wb.c')
-rw-r--r--sys/pci/if_wb.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index b540e00..b0ef638 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -941,11 +941,13 @@ wb_attach(dev)
*/
ether_ifattach(ifp, eaddr);
+ /* Hook interrupt last to avoid having to lock softc */
error = bus_setup_intr(dev, sc->wb_irq, INTR_TYPE_NET,
wb_intr, sc, &sc->wb_intrhand);
if (error) {
printf("wb%d: couldn't set up irq\n", unit);
+ ether_ifdetach(ifp);
goto fail;
}
@@ -956,6 +958,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
wb_detach(dev)
device_t dev;
@@ -968,14 +977,17 @@ wb_detach(dev)
WB_LOCK(sc);
ifp = &sc->arpcom.ac_if;
- /* Delete any miibus and phy devices attached to this interface */
+ /*
+ * Delete any miibus and phy devices attached to this interface.
+ * This should only be done if attach succeeded.
+ */
if (device_is_alive(dev)) {
- if (bus_child_present(dev))
- wb_stop(sc);
+ wb_stop(sc);
ether_ifdetach(ifp);
- device_delete_child(dev, sc->wb_miibus);
- bus_generic_detach(dev);
}
+ if (sc->wb_miibus)
+ device_delete_child(dev, sc->wb_miibus);
+ bus_generic_detach(dev);
if (sc->wb_intrhand)
bus_teardown_intr(dev, sc->wb_irq, sc->wb_intrhand);
OpenPOWER on IntegriCloud