diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-01-04 07:57:29 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-01-04 07:57:29 +0000 |
| commit | 0a2af6998a98513fad5e50f2849fde5e5fd1f483 (patch) | |
| tree | add2c2cf2d6824be0645cfbfcc6a0623d4b306da /sys/dev | |
| parent | cdef85eba9edacc5dbfd95583c1636bb18600abc (diff) | |
protect the ccb free queue with a mutex rather than splbio
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mfi.c | 15 | ||||
| -rw-r--r-- | sys/dev/ic/mfivar.h | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 247952cbccb..b7a56198da0 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.96 2010/01/03 14:57:10 chl Exp $ */ +/* $OpenBSD: mfi.c,v 1.97 2010/01/04 07:57:28 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -152,15 +152,14 @@ struct mfi_ccb * mfi_get_ccb(struct mfi_softc *sc) { struct mfi_ccb *ccb; - int s; - s = splbio(); + mtx_enter(&sc->sc_ccb_mtx); ccb = TAILQ_FIRST(&sc->sc_ccb_freeq); - if (ccb) { + if (ccb != NULL) { TAILQ_REMOVE(&sc->sc_ccb_freeq, ccb, ccb_link); ccb->ccb_state = MFI_CCB_READY; } - splx(s); + mtx_leave(&sc->sc_ccb_mtx); DNPRINTF(MFI_D_CCB, "%s: mfi_get_ccb: %p\n", DEVNAME(sc), ccb); @@ -172,7 +171,6 @@ mfi_put_ccb(struct mfi_ccb *ccb) { struct mfi_softc *sc = ccb->ccb_sc; struct mfi_frame_header *hdr = &ccb->ccb_frame->mfr_header; - int s; DNPRINTF(MFI_D_CCB, "%s: mfi_put_ccb: %p\n", DEVNAME(sc), ccb); @@ -189,9 +187,9 @@ mfi_put_ccb(struct mfi_ccb *ccb) ccb->ccb_data = NULL; ccb->ccb_len = 0; - s = splbio(); + mtx_enter(&sc->sc_ccb_mtx); TAILQ_INSERT_TAIL(&sc->sc_ccb_freeq, ccb, ccb_link); - splx(s); + mtx_leave(&sc->sc_ccb_mtx); } int @@ -641,6 +639,7 @@ mfi_attach(struct mfi_softc *sc, enum mfi_iop iop) return (1); TAILQ_INIT(&sc->sc_ccb_freeq); + mtx_init(&sc->sc_ccb_mtx, IPL_BIO); rw_init(&sc->sc_lock, "mfi_lock"); diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h index 1b6cd59e0ca..c7518330607 100644 --- a/sys/dev/ic/mfivar.h +++ b/sys/dev/ic/mfivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfivar.h,v 1.35 2009/01/28 23:45:12 marco Exp $ */ +/* $OpenBSD: mfivar.h,v 1.36 2010/01/04 07:57:28 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -157,6 +157,7 @@ struct mfi_softc { struct mfi_mem *sc_sense; struct mfi_ccb_list sc_ccb_freeq; + struct mutex sc_ccb_mtx; /* mgmt lock */ struct rwlock sc_lock; |