Module Name: src
Committed By: snj
Date: Sat Sep 26 17:56:38 UTC 2009
Modified Files:
src/sys/arch/sgimips/ioc [netbsd-5]: ioc.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #975):
sys/arch/sgimips/ioc/ioc.c: revision 1.8
Comment out some register initialization which the firmware should
have taken care of anyway. Apparently doing this here disrupts
newport's blitter operations and causes a deadlock.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.30.1 src/sys/arch/sgimips/ioc/ioc.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/arch/sgimips/ioc/ioc.c
diff -u src/sys/arch/sgimips/ioc/ioc.c:1.7 src/sys/arch/sgimips/ioc/ioc.c:1.7.30.1
--- src/sys/arch/sgimips/ioc/ioc.c:1.7 Wed Oct 17 19:57:05 2007
+++ src/sys/arch/sgimips/ioc/ioc.c Sat Sep 26 17:56:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.7 2007/10/17 19:57:05 garbled Exp $ */
+/* $NetBSD: ioc.c,v 1.7.30.1 2009/09/26 17:56:37 snj Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.7 2007/10/17 19:57:05 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.7.30.1 2009/09/26 17:56:37 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -140,10 +140,13 @@
IOC_WRITE_ENET_AUTO | IOC_WRITE_ENET_UTP |
IOC_WRITE_PC_UART2 | IOC_WRITE_PC_UART1);
+/* XXX: the firmware should have taken care of this already */
+#if 0
if (mach_subtype == MACH_SGI_IP22_GUINNESS) {
bus_space_write_4(sc->sc_iot, sc->sc_ioh, IOC_GCSEL, 0xff);
bus_space_write_4(sc->sc_iot, sc->sc_ioh, IOC_GCREG, 0xff);
}
+#endif
#if defined(BLINK)
ioc_blink(sc);
