> Date: Tue, 9 Sep 2014 15:10:46 +1000
> From: David Gwynne <da...@gwynne.id.au>
>
> mpsafe mpi. eyes would be appreciated. tests well to me.
>
> ok?
Tested on
mpi0 at pci5 dev 0 function 0 "Symbios Logic SAS1064E" rev 0x02: msi
Couldn't find any problems in the code, so
ok kettenis@
> Index: ic/mpi.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/mpi.c,v
> retrieving revision 1.195
> diff -u -p -r1.195 mpi.c
> --- ic/mpi.c 3 Sep 2014 00:46:04 -0000 1.195
> +++ ic/mpi.c 9 Sep 2014 05:09:37 -0000
> @@ -1311,6 +1311,8 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
>
> DNPRINTF(MPI_D_CMD, "%s: mpi_scsi_cmd\n", DEVNAME(sc));
>
> + KERNEL_UNLOCK();
> +
> if (xs->cmdlen > MPI_CDB_LEN) {
> DNPRINTF(MPI_D_CMD, "%s: CBD too big %d\n",
> DEVNAME(sc), xs->cmdlen);
> @@ -1319,8 +1321,7 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
> xs->sense.flags = SKEY_ILLEGAL_REQUEST;
> xs->sense.add_sense_code = 0x20;
> xs->error = XS_SENSE;
> - scsi_done(xs);
> - return;
> + goto done;
> }
>
> ccb = xs->io;
> @@ -1372,23 +1373,25 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
> htolem32(&io->sense_buf_low_addr, ccb->ccb_cmd_dva +
> ((u_int8_t *)&mcb->mcb_sense - (u_int8_t *)mcb));
>
> - if (mpi_load_xs(ccb) != 0) {
> - xs->error = XS_DRIVER_STUFFUP;
> - scsi_done(xs);
> - return;
> - }
> + if (mpi_load_xs(ccb) != 0)
> + goto stuffup;
>
> timeout_set(&xs->stimeout, mpi_timeout_xs, ccb);
>
> if (xs->flags & SCSI_POLL) {
> - if (mpi_poll(sc, ccb, xs->timeout) != 0) {
> - xs->error = XS_DRIVER_STUFFUP;
> - scsi_done(xs);
> - }
> - return;
> - }
> + if (mpi_poll(sc, ccb, xs->timeout) != 0)
> + goto stuffup;
> + } else
> + mpi_start(sc, ccb);
>
> - mpi_start(sc, ccb);
> + KERNEL_LOCK();
> + return;
> +
> +stuffup:
> + xs->error = XS_DRIVER_STUFFUP;
> +done:
> + KERNEL_LOCK();
> + scsi_done(xs);
> }
>
> void
> @@ -1415,7 +1418,9 @@ mpi_scsi_cmd_done(struct mpi_ccb *ccb)
> if (ccb->ccb_rcb == NULL) {
> /* no scsi error, we're ok so drop out early */
> xs->status = SCSI_OK;
> + KERNEL_LOCK();
> scsi_done(xs);
> + KERNEL_UNLOCK();
> return;
> }
>
> @@ -2370,14 +2375,18 @@ mpi_evt_sas(struct mpi_softc *sc, struct
> switch (ch->reason) {
> case MPI_EVT_SASCH_REASON_ADDED:
> case MPI_EVT_SASCH_REASON_NO_PERSIST_ADDED:
> + KERNEL_LOCK();
> if (scsi_req_probe(sc->sc_scsibus, ch->target, -1) != 0) {
> printf("%s: unable to request attach of %d\n",
> DEVNAME(sc), ch->target);
> }
> + KERNEL_UNLOCK();
> break;
>
> case MPI_EVT_SASCH_REASON_NOT_RESPONDING:
> + KERNEL_LOCK();
> scsi_activate(sc->sc_scsibus, ch->target, -1, DVACT_DEACTIVATE);
> + KERNEL_UNLOCK();
>
> mtx_enter(&sc->sc_evt_scan_mtx);
> SIMPLEQ_INSERT_TAIL(&sc->sc_evt_scan_queue, rcb, rcb_link);
> @@ -2451,11 +2460,13 @@ mpi_evt_sas_detach_done(struct mpi_ccb *
> struct mpi_softc *sc = ccb->ccb_sc;
> struct mpi_msg_scsi_task_reply *r = ccb->ccb_rcb->rcb_reply;
>
> + KERNEL_LOCK();
> if (scsi_req_detach(sc->sc_scsibus, r->target_id, -1,
> DETACH_FORCE) != 0) {
> printf("%s: unable to request detach of %d\n",
> DEVNAME(sc), r->target_id);
> }
> + KERNEL_UNLOCK();
>
> mpi_push_reply(sc, ccb->ccb_rcb);
> scsi_io_put(&sc->sc_iopool, ccb);
> Index: pci/mpi_pci.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/mpi_pci.c,v
> retrieving revision 1.24
> diff -u -p -r1.24 mpi_pci.c
> --- pci/mpi_pci.c 9 Jun 2011 04:55:44 -0000 1.24
> +++ pci/mpi_pci.c 9 Sep 2014 05:09:37 -0000
> @@ -142,7 +142,7 @@ mpi_pci_attach(struct device *parent, st
> goto unmap;
> }
> intrstr = pci_intr_string(psc->psc_pc, ih);
> - psc->psc_ih = pci_intr_establish(psc->psc_pc, ih, IPL_BIO,
> + psc->psc_ih = pci_intr_establish(psc->psc_pc, ih, IPL_BIO | IPL_MPSAFE,
> mpi_intr, sc, sc->sc_dev.dv_xname);
> if (psc->psc_ih == NULL) {
> printf(": unable to map interrupt%s%s\n",
>
