diff options
| author | scottl <scottl@FreeBSD.org> | 2007-04-15 08:49:19 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2007-04-15 08:49:19 +0000 |
| commit | 7605c12c0f2bf784960d36288b7cb6e451b99a15 (patch) | |
| tree | 010146772b36d16e6f98671b4bed7ce094acd633 /sys/dev/aic7xxx | |
| parent | 3e3198a9661d5d1c3e35abc313ad0d4688c6eea6 (diff) | |
| download | FreeBSD-src-7605c12c0f2bf784960d36288b7cb6e451b99a15.zip FreeBSD-src-7605c12c0f2bf784960d36288b7cb6e451b99a15.tar.gz | |
Remove Giant from CAM. Drivers (SIMs) now register a mutex that CAM will
use to synchornize and protect all data objects that are used for that
SIM. Drivers that are not yet MPSAFE register Giant and operate as
usual. RIght now, no drivers are MPSAFE, though a few will be changed
in the coming week as this work settles down.
The driver API has changed, so all CAM drivers will need to be recompiled.
The userland API has not changed, so tools like camcontrol do not need to
be recompiled.
Diffstat (limited to 'sys/dev/aic7xxx')
| -rw-r--r-- | sys/dev/aic7xxx/aic79xx_osm.c | 2 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_osm.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index e16b421..aef520d 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -143,7 +143,7 @@ ahd_attach(struct ahd_softc *ahd) */ sim = cam_sim_alloc(ahd_action, ahd_poll, "ahd", ahd, device_get_unit(ahd->dev_softc), - 1, /*XXX*/256, devq); + &Giant, 1, /*XXX*/256, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index f3b106c..b53f96a 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -196,7 +196,7 @@ ahc_attach(struct ahc_softc *ahc) */ sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - 1, AHC_MAX_QUEUE, devq); + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -227,7 +227,8 @@ ahc_attach(struct ahc_softc *ahc) if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", - ahc, device_get_unit(ahc->dev_softc), 1, + ahc, device_get_unit(ahc->dev_softc), + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim2 == NULL) { |
