Module Name: src
Committed By: jruoho
Date: Wed Feb 16 18:55:50 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
Explicitly re-enable the SCI interrupt when the wakeup starts (and before
interrupts are enabled). A workaround for a BIOS bug. Fixes the interrupt
storm reported by Taylor R. Campbell in PR # 44581.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/acpi/acpi_wakeup.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/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.27 src/sys/arch/x86/acpi/acpi_wakeup.c:1.28
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.27 Thu Jan 13 03:45:38 2011
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Wed Feb 16 18:55:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.27 2011/01/13 03:45:38 jruoho Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.27 2011/01/13 03:45:38 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <[email protected]>
@@ -342,6 +342,13 @@
inittodr(time_second);
/*
+ * The BIOS should always re-enable the SCI upon
+ * resume from the S3 state. The following is a
+ * workaround for systems that fail to do this.
+ */
+ (void)AcpiWriteBitRegister(ACPI_BITREG_SCI_ENABLE, 1);
+
+ /*
* Clear fixed events (see e.g. ACPI 3.0, p. 62).
* Also prevent GPEs from misfiring by disabling
* all GPEs before interrupts are enabled. The
