Module Name: src
Committed By: kiyohara
Date: Mon Dec 12 11:23:58 UTC 2011
Modified Files:
src/sys/arch/evbppc/explora: autoconf.c
src/sys/arch/evbppc/obs405: obs200_autoconf.c obs266_autoconf.c
obs600_autoconf.c
src/sys/arch/evbppc/virtex: autoconf.c
src/sys/arch/evbppc/walnut: autoconf.c
Log Message:
Fix hangs-up. Remove "wrteei 1" in board's cpu_configure(). Interrupt
is enabled in powerpc-layer.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/explora/autoconf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/obs405/obs200_autoconf.c \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/obs405/obs600_autoconf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/autoconf.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/walnut/autoconf.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/evbppc/explora/autoconf.c
diff -u src/sys/arch/evbppc/explora/autoconf.c:1.11 src/sys/arch/evbppc/explora/autoconf.c:1.12
--- src/sys/arch/evbppc/explora/autoconf.c:1.11 Sat Jun 18 06:44:25 2011
+++ src/sys/arch/evbppc/explora/autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.11 2011/06/18 06:44:25 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.12 2011/12/12 11:23:57 kiyohara Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2011/06/18 06:44:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -52,11 +52,6 @@ cpu_configure(void)
imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
(void)spl0();
-
- /*
- * Now allow hardware interrupts.
- */
- __asm volatile ("wrteei 1");
}
void
Index: src/sys/arch/evbppc/obs405/obs200_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.6 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.7
--- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.6 Sat Jun 18 06:44:26 2011
+++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_autoconf.c,v 1.6 2011/06/18 06:44:26 matt Exp $ */
+/* $NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.6 2011/06/18 06:44:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -67,11 +67,6 @@ cpu_configure(void)
imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
(void)spl0();
-
- /*
- * Now allow hardware interrupts.
- */
- __asm volatile ("wrteei 1");
}
void device_register(device_t dev, void *aux)
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.6 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.7
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.6 Sat Jun 18 06:44:26 2011
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.6 2011/06/18 06:44:26 matt Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.6 2011/06/18 06:44:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -63,11 +63,6 @@ cpu_configure(void)
panic("configure: mainbus not configured");
(void)spl0();
-
- /*
- * Now allow hardware interrupts.
- */
- __asm volatile ("wrteei 1");
}
void
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.4 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.5
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.4 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.4 2011/06/20 17:44:33 matt Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.5 2011/12/12 11:23:57 kiyohara Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.4 2011/06/20 17:44:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.5 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -72,11 +72,6 @@ cpu_configure(void)
imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
(void)spl0();
-
- /*
- * Now allow hardware interrupts.
- */
- __asm volatile ("wrteei 1");
}
void
Index: src/sys/arch/evbppc/virtex/autoconf.c
diff -u src/sys/arch/evbppc/virtex/autoconf.c:1.3 src/sys/arch/evbppc/virtex/autoconf.c:1.4
--- src/sys/arch/evbppc/virtex/autoconf.c:1.3 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.3 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.4 2011/12/12 11:23:57 kiyohara Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -94,9 +94,6 @@ cpu_configure(void)
panic("configure: plb not configured");
(void)spl0();
-
- /* Now allow hardware interrupts. */
- __asm volatile ("isync ; wrteei 1");
}
/*
Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.19 src/sys/arch/evbppc/walnut/autoconf.c:1.20
--- src/sys/arch/evbppc/walnut/autoconf.c:1.19 Sat Jun 18 06:44:28 2011
+++ src/sys/arch/evbppc/walnut/autoconf.c Mon Dec 12 11:23:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.19 2011/06/18 06:44:28 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.20 2011/12/12 11:23:57 kiyohara Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/06/18 06:44:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2011/12/12 11:23:57 kiyohara Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -72,11 +72,6 @@ cpu_configure(void)
panic("configure: plb not configured");
(void)spl0();
-
- /*
- * Now allow hardware interrupts.
- */
- __asm volatile ("wrteei 1");
}
/*
