diff options
| -rw-r--r-- | sys/dev/amr/amr.c | 31 | ||||
| -rw-r--r-- | sys/dev/amr/amr_pci.c | 1 | ||||
| -rw-r--r-- | sys/dev/amr/amrvar.h | 1 |
3 files changed, 13 insertions, 20 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index d7e806c..e3c0f28 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -383,9 +383,6 @@ amr_free(struct amr_softc *sc) if (mtx_initialized(&sc->amr_list_lock)) mtx_destroy(&sc->amr_list_lock); - - if (mtx_initialized(&sc->amr_wait_lock)) - mtx_destroy(&sc->amr_wait_lock); } /******************************************************************************* @@ -601,7 +598,6 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, mtx_lock(&sc->amr_list_lock); while ((ac = amr_alloccmd(sc)) == NULL) msleep(sc, &sc->amr_list_lock, PPAUSE, "amrioc", hz); - mtx_unlock(&sc->amr_list_lock); ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT|AMR_CMD_CCB_DATAIN|AMR_CMD_CCB_DATAOUT; bzero(&ac->ac_mailbox, sizeof(ac->ac_mailbox)); @@ -615,6 +611,7 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, temp = (void *)(uintptr_t)ap->ap_data_transfer_address; error = amr_wait_command(ac); + mtx_unlock(&sc->amr_list_lock); if (error) break; @@ -655,7 +652,6 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, mtx_lock(&sc->amr_list_lock); while ((ac = amr_alloccmd(sc)) == NULL) msleep(sc, &sc->amr_list_lock, PPAUSE, "amrioc", hz); - mtx_unlock(&sc->amr_list_lock); ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT; bzero(&ac->ac_mailbox, sizeof(ac->ac_mailbox)); @@ -666,6 +662,7 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, ac->ac_flags = ac_flags; error = amr_wait_command(ac); + mtx_unlock(&sc->amr_list_lock); if (error) break; @@ -812,7 +809,6 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t * mtx_lock(&sc->amr_list_lock); while ((ac = amr_alloccmd(sc)) == NULL) msleep(sc, &sc->amr_list_lock, PPAUSE, "amrioc", hz); - mtx_unlock(&sc->amr_list_lock); /* handle SCSI passthrough command */ if (au_cmd[0] == AMR_CMD_PASS) { @@ -863,7 +859,9 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t * ac->ac_flags = ac_flags; /* run the command */ - if ((error = amr_wait_command(ac)) != 0) + error = amr_wait_command(ac); + mtx_unlock(&sc->amr_list_lock); + if (error) goto out; /* copy out data and set status */ @@ -1335,11 +1333,9 @@ amr_wait_command(struct amr_command *ac) return(error); } - mtx_lock(&sc->amr_wait_lock); while ((ac->ac_flags & AMR_CMD_BUSY) && (error != EWOULDBLOCK)) { - error = msleep(ac,&sc->amr_wait_lock, PRIBIO, "amrwcmd", 0); + error = msleep(ac,&sc->amr_list_lock, PRIBIO, "amrwcmd", 0); } - mtx_unlock(&sc->amr_wait_lock); return(error); } @@ -2013,16 +2009,15 @@ amr_complete(void *context, int pending) /* * Is someone sleeping on this one? */ - } else if (ac->ac_flags & AMR_CMD_SLEEP) { - mtx_lock(&sc->amr_wait_lock); - /* unbusy the command */ - ac->ac_flags &= ~AMR_CMD_BUSY; - mtx_unlock(&sc->amr_wait_lock); - wakeup(ac); } else { - /* unbusy the command */ + mtx_lock(&sc->amr_list_lock); ac->ac_flags &= ~AMR_CMD_BUSY; - } + if (ac->ac_flags & AMR_CMD_SLEEP) { + /* unbusy the command */ + wakeup(ac); + } + mtx_unlock(&sc->amr_list_lock); + } if(!sc->amr_busyslots) { wakeup(sc); diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index fafd9f2..f873edf 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -331,7 +331,6 @@ amr_pci_attach(device_t dev) */ mtx_init(&sc->amr_list_lock, "AMR List Lock", NULL, MTX_DEF); mtx_init(&sc->amr_hw_lock, "AMR HW Lock", NULL, MTX_DEF); - mtx_init(&sc->amr_wait_lock, "AMR Wait Lock", NULL, MTX_DEF); if ((error = amr_setup_mbox(sc)) != 0) goto out; diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h index 4ff0c90..2f9a728 100644 --- a/sys/dev/amr/amrvar.h +++ b/sys/dev/amr/amrvar.h @@ -244,7 +244,6 @@ struct amr_softc int amr_linux_no_adapters; int amr_ld_del_supported; struct mtx amr_hw_lock; - struct mtx amr_wait_lock; }; /* |
