Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another fix from Achim Leubner @ ICP: 

Test-busy *before* marking the controller as processing a user ioctl,
otherwise the command queue could stall permanently if test-busy returned
true.
This commit is contained in:
thorpej 2003-05-17 15:34:12 +00:00
parent 8969ba6ff5
commit 548e1373f8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ic/icp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icp.c,v 1.8 2003/05/13 15:42:33 thorpej Exp $ */ /* $NetBSD: icp.c,v 1.9 2003/05/17 15:34:12 thorpej Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -80,7 +80,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.8 2003/05/13 15:42:33 thorpej Exp $"); __KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.9 2003/05/17 15:34:12 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -886,6 +886,8 @@ icp_ccb_enqueue(struct icp_softc *icp, struct icp_ccb *ic)
*/ */
if (icp->icp_ucmd_ccb != NULL) if (icp->icp_ucmd_ccb != NULL)
break; break;
if ((*icp->icp_test_busy)(icp))
break;
icp->icp_ucmd_ccb = ic; icp->icp_ucmd_ccb = ic;
if (iu->iu_cnt != 0) { if (iu->iu_cnt != 0) {
@ -897,10 +899,14 @@ icp_ccb_enqueue(struct icp_softc *icp, struct icp_ccb *ic)
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREREAD |
BUS_DMASYNC_PREWRITE); BUS_DMASYNC_PREWRITE);
} }
} else if ((ic = SIMPLEQ_FIRST(&icp->icp_ccb_queue)) == NULL) } else if (__predict_true((ic =
break; SIMPLEQ_FIRST(&icp->icp_ccb_queue)) != NULL)) {
if ((*icp->icp_test_busy)(icp)) if ((*icp->icp_test_busy)(icp))
break; break;
} else {
/* no command found */
break;
}
icp_ccb_submit(icp, ic); icp_ccb_submit(icp, ic);
if (__predict_false((ic->ic_flags & IC_UCMD) != 0)) if (__predict_false((ic->ic_flags & IC_UCMD) != 0))
SIMPLEQ_REMOVE_HEAD(&icp->icp_ucmd_queue, ic_chain); SIMPLEQ_REMOVE_HEAD(&icp->icp_ucmd_queue, ic_chain);