Module Name: src
Committed By: riz
Date: Sat Apr 21 16:00:47 UTC 2012
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: ioapic.c
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1747):
sys/arch/x86/x86/ioapic.c: revision 1.46
sys/arch/x86/x86/ioapic.c: revision 1.47
Mask all i8259 interrupts in ioapic_enable().
Should fix PR kern/45160.
Need i8259.h for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/arch/x86/x86/ioapic.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/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.38.6.1 src/sys/arch/x86/x86/ioapic.c:1.38.6.2
--- src/sys/arch/x86/x86/ioapic.c:1.38.6.1 Tue Sep 29 23:55:49 2009
+++ src/sys/arch/x86/x86/ioapic.c Sat Apr 21 16:00:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.38.6.1 2009/09/29 23:55:49 snj Exp $ */
+/* $NetBSD: ioapic.c,v 1.38.6.2 2012/04/21 16:00:47 riz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.38.6.1 2009/09/29 23:55:49 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.38.6.2 2012/04/21 16:00:47 riz Exp $");
#include "opt_ddb.h"
@@ -83,6 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1
#include <machine/i82093var.h>
#include <machine/i82489reg.h>
#include <machine/i82489var.h>
+#include <machine/i8259.h>
#include <machine/mpbiosvar.h>
#include <machine/pio.h>
#include <machine/pmap.h>
@@ -461,6 +462,8 @@ ioapic_enable(void)
if (ioapics == NULL)
return;
+ i8259_setmask(0xffff);
+
if (ioapics->sc_flags & IOAPIC_PICMODE) {
aprint_debug_dev(ioapics->sc_dev,
"writing to IMCR to disable pics\n");
