From 3e2692fd422754febd92a4d1613d4c2d454b8adc Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Tue, 15 Jun 2010 18:51:41 +0000
Subject: Restore the machine check register banks on resume.  For banks being
 monitored via CMCI, reset the interrupt threshold to 1 on resume.

Reviewed by:	jkim
MFC after:	2 weeks
---
 sys/i386/acpica/acpi_wakeup.c | 2 ++
 sys/i386/include/mca.h        | 1 +
 2 files changed, 3 insertions(+)

(limited to 'sys/i386')

diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index af8d4b2..60bc31f 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
 #include <machine/intr_machdep.h>
+#include <machine/mca.h>
 #include <machine/segments.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -272,6 +273,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 		for (;;) ;
 	} else {
 		/* Execute Wakeup */
+		mca_resume();
 		intr_resume();
 
 		if (bootverbose) {
diff --git a/sys/i386/include/mca.h b/sys/i386/include/mca.h
index 951750f..dd6e69c 100644
--- a/sys/i386/include/mca.h
+++ b/sys/i386/include/mca.h
@@ -49,6 +49,7 @@ struct mca_record {
 void	cmc_intr(void);
 void	mca_init(void);
 int	mca_intr(void);
+void	mca_resume(void);
 
 #endif
 
-- 
cgit v1.1