sgi/mvme68k tests for sbic(4)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

sgi/mvme68k tests for sbic(4)

David Gwynne-5
this gets rid of XS_NO_CCB in sbic(4) by moving to iopools. i dont
have an arch that uses this so i mostly want compile testers, but
if someone actually has the hardware that would be great.

this change is mildly interesting because it demonstrates the
flexibility of iopools at sharing resources between consumers. the
command resources are shared at the kernel level, rather than on a
controller or for a target like you see on most hardware. iopools
will guarantee fair access to the command descriptors across all
controllers.

ok?

Index: wd33c93.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/wd33c93.c,v
retrieving revision 1.4
diff -u -p -r1.4 wd33c93.c
--- wd33c93.c 2 Jul 2012 18:17:43 -0000 1.4
+++ wd33c93.c 17 Jan 2014 23:06:20 -0000
@@ -142,8 +142,12 @@ u_char wd33c93_stp2syn(struct wd33c93_so
 void wd33c93_setsync(struct wd33c93_softc *, struct wd33c93_tinfo *);
 
 struct pool wd33c93_pool; /* Adapter Control Blocks */
+struct scsi_iopool wd33c93_iopool;
 int wd33c93_pool_initialized = 0;
 
+void * wd33c93_io_get(void *);
+void wd33c93_io_put(void *, void *);
+
 /*
  * Timeouts
  */
@@ -204,6 +208,7 @@ wd33c93_attach(struct wd33c93_softc *sc,
  sc->sc_link.adapter = adapter;
  sc->sc_link.openings = 2;
  sc->sc_link.luns = SBIC_NLUN;
+ sc->sc_link.pool = &wd33c93_iopool;
 
  bzero(&saa, sizeof(saa));
  saa.saa_sc_link = &sc->sc_link;
@@ -226,6 +231,9 @@ wd33c93_init(struct wd33c93_softc *sc)
  /* All instances share the same pool */
  pool_init(&wd33c93_pool, sizeof(struct wd33c93_acb), 0, 0, 0,
     "wd33c93_acb", NULL);
+ pool_setipl(&wd33c93_pool, IPL_BIO);
+ scsi_iopool_init(&wd33c93_iopool, NULL,
+    wd33c93_io_get, wd33c93_io_put);
  ++wd33c93_pool_initialized;
  }
 
@@ -574,17 +582,8 @@ wd33c93_scsi_cmd(struct scsi_xfer *xs)
  if (sc->sc_nexus && (flags & SCSI_POLL))
  panic("wd33c93_scsicmd: busy");
 
- s = splbio();
- acb = (struct wd33c93_acb *)pool_get(&wd33c93_pool,
-    PR_NOWAIT | PR_ZERO);
- splx(s);
-
- if (acb == NULL) {
- xs->error = XS_NO_CCB;
- scsi_done(xs);
- return;
- }
-
+ acb = xs->io;
+ memset(acb, 0, sizeof(*acb));
  acb->flags = ACB_ACTIVE;
  acb->xs    = xs;
  acb->timeout = xs->timeout;
@@ -823,14 +822,6 @@ wd33c93_scsidone(struct wd33c93_softc *s
  wd33c93_sched(sc);
  }
 
- /* place control block back on free list. */
- if ((xs->flags & SCSI_POLL) == 0) {
- s = splbio();
- acb->flags = ACB_FREE;
- pool_put(&wd33c93_pool, acb);
- splx(s);
- }
-
  scsi_done(xs);
 }
 
@@ -1436,11 +1427,6 @@ wd33c93_poll(struct wd33c93_softc *sc, s
  }
 
  if ((xs->flags & ITSDONE) != 0) {
- s = splbio();
- acb->flags = ACB_FREE;
- pool_put(&wd33c93_pool, acb);
- splx(s);
-
  return (0);
  }
 
@@ -2298,6 +2284,17 @@ wd33c93_watchdog(void *arg)
  timeout_add_sec(&sc->sc_watchdog, 60);
 }
 
+void *
+wd33c93_io_get(void *null)
+{
+ return (pool_get(&wd33c93_pool, PR_NOWAIT));
+}
+
+void *
+wd33c93_io_put(void *null, void *io)
+{
+ pool_put(&wd33c93_pool, io);
+}
 
 #ifdef SBICDEBUG
 void