diff options
author | scottl <scottl@FreeBSD.org> | 2003-06-26 00:03:59 +0000 |
---|---|---|
committer | scottl <scottl@FreeBSD.org> | 2003-06-26 00:03:59 +0000 |
commit | 2c94c4118c28e42becd45242eccfb3dbc15e199c (patch) | |
tree | a44cbcf05050fb0e7ea38906671beb724d169bf6 /sys/dev/ips/ips_pci.c | |
parent | 3a0952afbd82dda0c03d4f658194fd1503720a44 (diff) | |
download | FreeBSD-src-2c94c4118c28e42becd45242eccfb3dbc15e199c.zip FreeBSD-src-2c94c4118c28e42becd45242eccfb3dbc15e199c.tar.gz |
- Zero the buffers used to hold configuration data from the card. Not doing
so can leave stale data in the buffer and confuse the driver.
- enable the ability to set the 'disable' hint for the driver to keep it
from attaching. i.e. 'hw.ips.0.disable=1' will prevent the driver from
attaching.
- Only detach if attach suceeded.
Submitted by: mjacob
Diffstat (limited to 'sys/dev/ips/ips_pci.c')
-rw-r--r-- | sys/dev/ips/ips_pci.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c index 4999de6..f998732 100644 --- a/sys/dev/ips/ips_pci.c +++ b/sys/dev/ips/ips_pci.c @@ -50,8 +50,17 @@ static int ips_pci_probe(device_t dev) static int ips_pci_attach(device_t dev) { u_int32_t command; + int tval; ips_softc_t *sc; + + tval = 0; + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "disable", &tval) == 0 && tval) { + device_printf(dev, "device is disabled\n"); + /* but return 0 so the !$)$)*!$*) unit isn't reused */ + return (0); + } DEVICE_PRINTF(1, dev, "in attach.\n"); sc = (ips_softc_t *)device_get_softc(dev); if(!sc){ @@ -125,6 +134,7 @@ static int ips_pci_attach(device_t dev) } if(ips_adapter_init(sc)) goto error; + sc->configured = 1; return 0; error: ips_pci_free(sc); @@ -141,6 +151,7 @@ static int ips_pci_free(ips_softc_t *sc) bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irqrid, sc->irqres); if(sc->iores) bus_release_resource(sc->dev, sc->iotype, sc->rid, sc->iores); + sc->configured = 0; return 0; } @@ -149,18 +160,23 @@ static int ips_pci_detach(device_t dev) ips_softc_t *sc; DEVICE_PRINTF(1, dev, "detaching ServeRaid\n"); sc = (ips_softc_t *) device_get_softc(dev); - ips_flush_cache(sc); - if(ips_adapter_free(sc)) - return EBUSY; - ips_pci_free(sc); - mtx_destroy(&sc->cmd_mtx); + if (sc->configured) { + sc->configured = 0; + ips_flush_cache(sc); + if(ips_adapter_free(sc)) + return EBUSY; + ips_pci_free(sc); + mtx_destroy(&sc->cmd_mtx); + } return 0; } static int ips_pci_shutdown(device_t dev) { ips_softc_t *sc = (ips_softc_t *) device_get_softc(dev); - ips_flush_cache(sc); + if (sc->configured) { + ips_flush_cache(sc); + } return 0; } |