Setup ccbs and clean up ccb structure.

3 files changed, 78 insertions, 17 deletions

diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 05ca2ac2323..9d450e1d6bc 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.15 2006/04/16 23:39:43 marco Exp $ */
+/* $OpenBSD: mfi.c,v 1.16 2006/04/17 00:48:14 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -69,6 +69,7 @@ struct scsi_device mfi_dev = {
 
 struct mfi_ccb	*mfi_get_ccb(struct mfi_softc *);
 void		mfi_put_ccb(struct mfi_ccb *);
+int		mfi_init_ccb(struct mfi_softc *);
 
 u_int32_t	mfi_read(struct mfi_softc *, bus_size_t);
 void		mfi_write(struct mfi_softc *, bus_size_t, u_int32_t);
@@ -108,6 +109,53 @@ mfi_put_ccb(struct mfi_ccb *ccb)
 	splx(s);
 }
 
+int
+mfi_init_ccb(struct mfi_softc *sc)
+{
+	struct mfi_ccb		*ccb;
+	uint32_t		i;
+	int			error;
+
+	sc->sc_ccb = malloc(sizeof(struct mfi_ccb) * sc->sc_max_cmds,
+	    M_DEVBUF, M_WAITOK);
+	memset(sc->sc_ccb, 0, sizeof(struct mfi_ccb) * sc->sc_max_cmds);
+
+	for (i = 0; i < sc->sc_max_cmds; i++) {
+		ccb = &sc->sc_ccb[i];
+
+		ccb->ccb_sc = sc;
+
+		/* select i'th frame */
+		ccb->ccb_frame = (union mfi_frame *)
+		    (MFIMEM_KVA(sc->sc_frames) + sc->sc_frames_size * i);
+		ccb->ccb_pframe = htole32(
+		    MFIMEM_DVA(sc->sc_frames) + sc->sc_frames_size * i);
+		ccb->ccb_frame->mfr_header.mfh_context = i;
+
+		/* select i'th sense */
+		ccb->ccb_sense = (struct mfi_sense *)
+		    (MFIMEM_KVA(sc->sc_sense) + MFI_SENSE_SIZE * i);
+		ccb->ccb_psense = htole32(
+		    (MFIMEM_DVA(sc->sc_sense) + MFI_SENSE_SIZE * i));
+
+		/* create a dma map for transfer */
+		error = bus_dmamap_create(sc->sc_dmat,
+		    sc->sc_max_sgl * PAGE_SIZE,
+		    sc->sc_max_sgl, sc->sc_max_sgl * PAGE_SIZE, 0,
+		    BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &ccb->ccb_dmamap);
+		if (error) {
+			printf("%s: cannot create ccb dmamap (%d)\n",
+			    DEVNAME(sc), error);
+			goto destroy;
+		}
+	}
+
+	return (0);
+destroy:
+	/* XXX free dma maps */
+	return (1);
+}
+
 u_int32_t
 mfi_read(struct mfi_softc *sc, bus_size_t r)
 {
@@ -280,25 +328,32 @@ mfi_attach(struct mfi_softc *sc)
 	/* we are not doing 64 bit IO so only calculate # of 32 bit frames */
 	frames = (sizeof(struct mfi_sg32) * sc->sc_max_sgl +
 	    MFI_FRAME_SIZE - 1) / MFI_FRAME_SIZE + 1;
-	sc->sc_frames = mfi_allocmem(sc, frames * MFI_FRAME_SIZE);
+	sc->sc_frames_size = frames * MFI_FRAME_SIZE;
+	sc->sc_frames = mfi_allocmem(sc, sc->sc_frames_size * sc->sc_max_cmds);
 	if (sc->sc_frames == NULL) {
-		printf("%s: unable to allocate frame memory\n",
-		    DEVNAME(sc));
+		printf("%s: unable to allocate frame memory\n", DEVNAME(sc));
 		goto noframe;
 	}
 
 	/* sense memory */
 	sc->sc_sense = mfi_allocmem(sc, sc->sc_max_cmds * MFI_SENSE_SIZE);
 	if (sc->sc_sense == NULL) {
-		printf("%s: unable to allocate sense memory\n",
-		    DEVNAME(sc));
+		printf("%s: unable to allocate sense memory\n", DEVNAME(sc));
 		goto nosense;
 	}
 
+	/* now that we have all memory bits go initialize ccbs */
+	if (mfi_init_ccb(sc)) {
+		printf("%s: could not init ccb list\n", DEVNAME(sc));
+		goto noinit;
+	}
+
 	/* enable interrupts */
 	mfi_write(sc, MFI_OMSK, MFI_ENABLE_INTR);
 
 	return (0);
+noinit:
+	mfi_freemem(sc, sc->sc_sense);
 nosense:
 	mfi_freemem(sc, sc->sc_frames);
 noframe:
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h
index 017f7398eef..fb9ed0b7059 100644
--- a/sys/dev/ic/mfireg.h
+++ b/sys/dev/ic/mfireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfireg.h,v 1.6 2006/04/16 23:35:43 marco Exp $ */
+/* $OpenBSD: mfireg.h,v 1.7 2006/04/17 00:48:14 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -216,6 +216,11 @@ typedef enum {
 #define MFI_MAX_LUN				8
 #define MFI_MAX_LD				64
 
+/* sense buffer */
+struct mfi_sense {
+	uint8_t			mse_data[MFI_SENSE_SIZE];
+} __packed;
+
 /* scatter gather elements */
 struct mfi_sg32 {
 	uint32_t		addr;
diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h
index 523246809d4..1d5122a3f6c 100644
--- a/sys/dev/ic/mfivar.h
+++ b/sys/dev/ic/mfivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfivar.h,v 1.9 2006/04/16 23:35:43 marco Exp $ */
+/* $OpenBSD: mfivar.h,v 1.10 2006/04/17 00:48:14 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -53,19 +53,16 @@ struct mfi_prod_cons {
 struct mfi_ccb {
 	struct mfi_softc	*ccb_sc;
 
-	union mfi_frame		ccb_frame;
+	union mfi_frame		*ccb_frame;
 	paddr_t			ccb_pframe;
 
-#if 0
-	struct ami_iocmd	ccb_cmd;
-	struct ami_passthrough	*ccb_pt;
-	paddr_t			ccb_ptpa;
-	struct ami_sgent	*ccb_sglist;
-	paddr_t			ccb_sglistpa;
-	int			ccb_offset;
+	struct mfi_sense	*ccb_sense;
+	paddr_t			ccb_psense;
+
 	bus_dmamap_t		ccb_dmamap;
-#endif
+
 	struct scsi_xfer	*ccb_xs;
+
 	void			(*ccb_done)(struct mfi_softc *sc,
 				    struct mfi_ccb *ccb);
 
@@ -97,11 +94,15 @@ struct mfi_softc {
 	uint32_t		sc_max_cmds;
 	uint32_t		sc_max_sgl;
 
+	/* all commands */
+	struct mfi_ccb		*sc_ccb;
+
 	/* producer/consumer pointers and reply queue */
 	struct mfi_mem		*sc_pcq;
 
 	/* frame memory */
 	struct mfi_mem		*sc_frames;
+	uint32_t		sc_frames_size;
 
 	/* sense memory */
 	struct mfi_mem		*sc_sense;