Module Name: src
Committed By: tsutsui
Date: Wed Jan 13 12:43:06 UTC 2010
Modified Files:
src/sys/arch/sparc/sparc: auxreg.h
Log Message:
Explicitly clear AUXIO4M_FTC bit in FTC_FLIP macro used on
pseudo-dma for floppy, as well as AUXIO4C_FTC bit for sun4c.
A comment in the macro says AUXIO4M_FTC bit is auto-clear,
but my two SS20s (including compatible) with 150MHz hyperSPARCs
get data_overrun without it, and no bad side effect on SS5
(works with and without this change).
Closes PR port-sparc/42516, which is the last one of a bunch of
floppy issue on NetBSD/sparc since NetBSD 2.0 days. See
http://mail-index.NetBSD.org/port-sparc/2009/12/20/msg000484.html
for details.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/sparc/auxreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/auxreg.h
diff -u src/sys/arch/sparc/sparc/auxreg.h:1.12 src/sys/arch/sparc/sparc/auxreg.h:1.13
--- src/sys/arch/sparc/sparc/auxreg.h:1.12 Wed Nov 16 03:00:23 2005
+++ src/sys/arch/sparc/sparc/auxreg.h Wed Jan 13 12:43:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auxreg.h,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
+/* $NetBSD: auxreg.h,v 1.13 2010/01/13 12:43:06 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -105,6 +105,9 @@
if (CPU_ISSUN4M) { \
/* AUXIO4M_FTC bit is auto-clear */ \
*AUXIO4M_REG = auxio_regval | AUXIO4M_FTC; \
+ /* XXX we need to clear it on hyperSPARC SS20 */ \
+ DELAY(10); \
+ *AUXIO4M_REG = auxio_regval; \
} else { \
auxio_regval |= AUXIO4C_FTC; \
*AUXIO4C_REG = auxio_regval; \
