[src/trunk]: src/sys/dev/acpi Flush CPU caches before entering S1, as noted i...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64e7faa0e1bb
branches:  trunk
changeset: 765708:64e7faa0e1bb
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Fri Jun 03 09:15:02 2011 +0000

description:
Flush CPU caches before entering S1, as noted in the specifications.

diffstat:

 sys/dev/acpi/acpi.c |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 5ccea6f11e3c -r 64e7faa0e1bb sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Fri Jun 03 08:56:39 2011 +0000
+++ b/sys/dev/acpi/acpi.c       Fri Jun 03 09:15:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.241 2011/05/31 14:27:44 jruoho Exp $        */
+/*     $NetBSD: acpi.c,v 1.242 2011/06/03 09:15:02 jruoho Exp $        */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.241 2011/05/31 14:27:44 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.242 2011/06/03 09:15:02 jruoho Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -1301,12 +1301,17 @@
                if (state == ACPI_STATE_S1) {
 
                        /*
-                        * Enter the state. Note that interrupts must
-                        * be off before calling AcpiEnterSleepState().
-                        * Conversely, AcpiLeaveSleepState() should
-                        * always be called with interrupts enabled.
+                        * Before the transition to S1, CPU caches
+                        * must be flushed (see ACPI 4.0, 7.3.4.2).
+                        *
+                        * Note that interrupts must be off before
+                        * calling AcpiEnterSleepState(). Conversely,
+                        * AcpiLeaveSleepState() should always be
+                        * called with interrupts enabled.
                         */
                        acpi_md_OsDisableInterrupt();
+
+                       ACPI_FLUSH_CPU_CACHE();
                        rv = AcpiEnterSleepState(state);
 
                        if (ACPI_FAILURE(rv))