CVS commit: src/sys/dev/i2o

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Sun Feb 21 18:50:11 UTC 2010

Modified Files:
        src/sys/dev/i2o: iop.c

Log Message:
Fix confusion about PRE/POST in previous; and another place that has the
same issue. Also add a BUS_DMASYNC_POSTWRITE to the POLL operation.
Problem pointed out by tsut...@.
Still not perfect (a BUS_DMASYNC_PREREAD would be needed after the
testing the condition in the POLL() macro), but closer.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/i2o/iop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.79 src/sys/dev/i2o/iop.c:1.80
--- src/sys/dev/i2o/iop.c:1.79	Sun Feb 21 14:16:47 2010
+++ src/sys/dev/i2o/iop.c	Sun Feb 21 18:50:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $	*/
+/*	$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $");
 
 #include "iop.h"
 
@@ -990,17 +990,17 @@
 	mb[0] += 2 << 16;
 
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_PREWRITE);
+	    BUS_DMASYNC_POSTWRITE);
 	*sw = 0;
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_POSTWRITE);
+	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 
 	if ((rv = iop_post(sc, mb)) != 0)
 		return (rv);
 
 	POLL(5000,
 	    (bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_POSTREAD),
+	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD),
 	    *sw == htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)));
 
 	if (*sw != htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)) {
@@ -1535,17 +1535,17 @@
 	mf.statushigh = (u_int32_t)((u_int64_t)pa >> 32);
 
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_PREWRITE);
+	    BUS_DMASYNC_POSTWRITE);
 	*sw = htole32(0);
 	bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_POSTWRITE);
+	    BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
 
 	if ((rv = iop_post(sc, (u_int32_t *)&mf)))
 		return (rv);
 
 	POLL(2500,
 	    (bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
-	    BUS_DMASYNC_POSTREAD), *sw != 0));
+	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD), *sw != 0));
 	if (*sw != htole32(I2O_RESET_IN_PROGRESS)) {
 		aprint_error_dev(&sc->sc_dv, "reset rejected, status 0x%x\n",
 		    le32toh(*sw));