[PATCH](retry 2) Re: invalidate caches before going into suspend

[Mark Langsdorf <mark.langsdorf@amd.com>]

On Wednesday 13 August 2008, Ingo Molnar wrote:

> Thanks, this looks much better. Please create a wbinvd_halt() variant 
> a'la safe_halt() and please also add comments why that is needed.


When a CPU core is shut down, all of its caches need to be flushed
to prevent stale data from causing errors if the core is resumed.
Current Linux suspend code performs an assignment after the flush,
which can add dirty data back to the cache.  On some AMD platforms,
additional speculative reads have caused crashes on resume because
of this dirty data.

Relocate the cache flush to be the very last thing done before 
halting.  Tie into an assembly line so the compile will not
reorder it.  Add some documentation explaining what is going
on and why we're doing this.

Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
Acked-by: Mark Borden <mark.borden@amd.com>
Acked-by: Michael Hohmuth <michael.hohmuth@amd.com>
diff -r 1e74a821dd00 arch/x86/kernel/process_32.c
--- a/arch/x86/kernel/process_32.c	Tue Aug 12 12:04:12 2008 -0500
+++ b/arch/x86/kernel/process_32.c	Wed Aug 13 08:05:36 2008 -0500
@@ -95,7 +95,6 @@ static inline void play_dead(void)
 {
 	/* This must be done before dead CPU ack */
 	cpu_exit_clear();
-	wbinvd();
 	mb();
 	/* Ack it */
 	__get_cpu_var(cpu_state) = CPU_DEAD;
@@ -104,8 +103,12 @@ static inline void play_dead(void)
 	 * With physical CPU hotplug, we should halt the cpu
 	 */
 	local_irq_disable();
-	while (1)
-		halt();
+	/* mask all interrupts, flush any and all caches, and halt */
+	if (cpu_has_clflush)
+		wbinvd_halt();
+	else
+		while (1)
+			halt();
 }
 #else
 static inline void play_dead(void)
diff -r 1e74a821dd00 arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/process_64.c	Tue Aug 12 12:04:12 2008 -0500
+++ b/arch/x86/kernel/process_64.c	Wed Aug 13 08:05:41 2008 -0500
@@ -93,14 +93,17 @@ static inline void play_dead(void)
 static inline void play_dead(void)
 {
 	idle_task_exit();
-	wbinvd();
 	mb();
 	/* Ack it */
 	__get_cpu_var(cpu_state) = CPU_DEAD;
 
 	local_irq_disable();
-	while (1)
-		halt();
+	/* mask all interrupts, flush any and all caches, and halt */
+	if (cpu_has_clflush)
+		wbinvd_halt();
+	else
+		while (1)
+			halt();
 }
 #else
 static inline void play_dead(void)
diff -r 1e74a821dd00 include/asm-x86/irqflags.h
--- a/include/asm-x86/irqflags.h	Tue Aug 12 12:04:12 2008 -0500
+++ b/include/asm-x86/irqflags.h	Wed Aug 13 07:52:10 2008 -0500
@@ -47,6 +47,16 @@ static inline void native_halt(void)
 static inline void native_halt(void)
 {
 	asm volatile("hlt": : :"memory");
+}
+
+/* 
+ * flush all caches and go into a halt
+ *  used to guarantee that caches are clean before halting
+ *  during suspend/resume operations
+ */
+static inline void wbinvd_halt(void)
+{
+	asm volatile("cli; wbinvd; 1: hlt; jmp 1b": : :"memory");
 }
 
 #endif