patch-2.4.0-test12 linux/arch/mips64/sgi-ip27/ip27-init.c

Next file: linux/arch/mips64/sgi-ip27/ip27-irq.c
Previous file: linux/arch/mips64/sgi-ip27/ip27-console.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test11/linux/arch/mips64/sgi-ip27/ip27-init.c linux/arch/mips64/sgi-ip27/ip27-init.c
@@ -11,7 +11,7 @@
 #include <asm/sn/sn0/hubni.h>
 #include <asm/sn/sn0/hubio.h>
 #include <asm/sn/klconfig.h>
-#include <asm/ioc3.h>
+#include <asm/sn/ioc3.h>
 #include <asm/mipsregs.h>
 #include <asm/sn/gda.h>
 #include <asm/sn/intr.h>
@@ -271,6 +271,9 @@
 {
 	extern void pcibr_setup(cnodeid_t);
 	cnodemask_t	done;
+	nasid_t		nasid;
+
+	nasid = COMPACT_TO_NASID_NODEID(cnode);
 
 	spin_lock(&hub_mask_lock);
 	/* Test our bit. */
@@ -281,6 +284,11 @@
 	 	 * Do the actual initialization if it hasn't been done yet.
 	 	 * We don't need to hold a lock for this work.
 	 	 */
+		/*
+		 * Set CRB timeout at 5ms, (< PI timeout of 10ms)
+		 */
+		REMOTE_HUB_S(nasid, IIO_ICTP, 0x800);
+		REMOTE_HUB_S(nasid, IIO_ICTO, 0xff);
 		hub_rtc_init(cnode);
 		pcibr_setup(cnode); 
 #ifdef CONFIG_REPLICATE_EXHANDLERS

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)