 @@ -1,14 +1,14 @@
-/* $NetBSD: mfi.c,v 1.43 2012/08/23 09:59:13 bouyer Exp $ */
+/* $NetBSD: mfi.c,v 1.44 2012/08/23 12:24:33 bouyer Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 /*
  * Copyright (c) 2012 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -63,27 +63,27 @@
  * EXEMPLARY,OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION)HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * The views and conclusions contained in the software and documentation
  * are those of the authors and should not be interpreted as representing
  * official policies,either expressed or implied, of the FreeBSD Project.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.43 2012/08/23 09:59:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.44 2012/08/23 12:24:33 bouyer Exp $");
 #include "bio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 @@ -2702,27 +2702,26 @@ mfi_tbolt_build_mpt_ccb(struct mfi_ccb *
 	     MFIMEM_DVA(ccb->ccb_sc->sc_tbolt_reqmsgpool),
 	    MEGASAS_THUNDERBOLT_NEW_MSG_SIZE,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+}
 /*
  * Description:
  *      This function will prepare message pools for the Thunderbolt controller
  */
 static int
 mfi_tbolt_init_desc_pool(struct mfi_softc *sc)
+{
 	uint32_t     offset = 0;
 	uint32_t     tbolt_contg_length = sc->sc_tbolt_reqmsgpool->am_size;
 	uint8_t      *addr = MFIMEM_KVA(sc->sc_tbolt_reqmsgpool);
 	/* Request Decriptors alignement restrictions */
 	KASSERT(((uintptr_t)addr & 0xFF) == 0);
 	/* Skip request message pool */
 	addr = &addr[MEGASAS_THUNDERBOLT_NEW_MSG_SIZE * (sc->sc_max_cmds + 1)];
 	/* Reply Frame Pool is initialized */
 	sc->sc_reply_frame_pool = (struct mfi_mpi2_reply_header *) addr;
 	KASSERT(((uintptr_t)addr & 0xFF) == 0);
 	offset = (uintptr_t)sc->sc_reply_frame_pool
 @@ -2735,27 +2734,27 @@ mfi_tbolt_init_desc_pool(struct mfi_soft
 	       (MEGASAS_THUNDERBOLT_REPLY_SIZE * sc->sc_reply_pool_size));
 	/* Skip Reply Frame Pool */
 	addr += MEGASAS_THUNDERBOLT_REPLY_SIZE * sc->sc_reply_pool_size;
 	sc->sc_reply_pool_limit = (void *)addr;
 	offset = MEGASAS_THUNDERBOLT_REPLY_SIZE * sc->sc_reply_pool_size;
 	sc->sc_sg_frame_busaddr = sc->sc_reply_frame_busaddr + offset;
 	/* initialize the last_reply_idx to 0 */
 	sc->sc_last_reply_idx = 0;
 	offset = (sc->sc_sg_frame_busaddr + (MEGASAS_MAX_SZ_CHAIN_FRAME *
 	    sc->sc_max_cmds)) - MFIMEM_DVA(sc->sc_tbolt_reqmsgpool);
-	KASSERT(offset <= tbolt_contg_length);
+	KASSERT(offset <= sc->sc_tbolt_reqmsgpool->am_size);
 	bus_dmamap_sync(sc->sc_dmat, MFIMEM_MAP(sc->sc_tbolt_reqmsgpool), 0,
 	    MFIMEM_MAP(sc->sc_tbolt_reqmsgpool)->dm_mapsize,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 	return 0;
+}
 /*
  * This routine prepare and issue INIT2 frame to the Firmware
  */
 static int
 mfi_tbolt_init_MFI_queue(struct mfi_softc *sc)
+{