Index: sys/dev/aac/aacvar.h
===================================================================
--- sys/dev/aac/aacvar.h	(revision 200237)
+++ sys/dev/aac/aacvar.h	(working copy)
@@ -57,13 +57,6 @@
 #define AAC_ADAPTER_FIBS	8
 
 /*
- * FIBs are allocated in page-size chunks and can grow up to the 512
- * limit imposed by the hardware.
- */
-#define AAC_PREALLOCATE_FIBS	128
-#define AAC_NUM_MGT_FIB		8
-
-/*
  * The controller reports status events in AIFs.  We hang on to a number of
  * these in order to pass them out to user-space management tools.
  */
Index: sys/dev/aac/aac.c
===================================================================
--- sys/dev/aac/aac.c	(revision 200237)
+++ sys/dev/aac/aac.c	(working copy)
@@ -604,7 +604,7 @@ aac_alloc(struct aac_softc *sc)
 	TAILQ_INIT(&sc->aac_fibmap_tqh);
 	sc->aac_commands = malloc(sc->aac_max_fibs * sizeof(struct aac_command),
 				  M_AACBUF, M_WAITOK|M_ZERO);
-	while (sc->total_fibs < AAC_PREALLOCATE_FIBS) {
+	while (sc->total_fibs < sc->aac_max_fibs / 2) {
 		if (aac_alloc_commands(sc) != 0)
 			break;
 	}
Index: sys/dev/aac/aac_cam.c
===================================================================
--- sys/dev/aac/aac_cam.c	(revision 200237)
+++ sys/dev/aac/aac_cam.c	(working copy)
@@ -260,8 +260,11 @@ aac_cam_action(struct cam_sim *sim, union ccb *ccb
 		cpi->hba_inquiry = PI_WIDE_16;
 		cpi->target_sprt = 0;
 
-		/* Resetting via the passthrough causes problems. */
-		cpi->hba_misc = PIM_NOBUSRESET;
+		/*
+		 * Resetting via the passthrough or parallel bus scan
+		 * causes problems.
+		 */
+		cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = camsc->inf->TargetsPerBus;
 		cpi->max_lun = 8;	/* Per the controller spec */