aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-12-07 14:12:21 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-14 10:48:41 -0800
commit84326e0aad2cbf53567d1b356296109e94240edb (patch)
treeb39f06cec45355f39068e2e134c2d1ff817882a7
parent3e38142b237ab1c79e2ef3dafbd1eaf52219ba41 (diff)
downloadmrst-s0i3-test-84326e0aad2cbf53567d1b356296109e94240edb.tar.gz
mrst-s0i3-test-84326e0aad2cbf53567d1b356296109e94240edb.tar.xz
mrst-s0i3-test-84326e0aad2cbf53567d1b356296109e94240edb.zip
s0i3: remove simulation code
We got entry working properly, no need to simulate further. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--drivers/idle/mrst_s0i3_asm.S25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/idle/mrst_s0i3_asm.S b/drivers/idle/mrst_s0i3_asm.S
index 1482bf78416..4b9e8be5fe1 100644
--- a/drivers/idle/mrst_s0i3_asm.S
+++ b/drivers/idle/mrst_s0i3_asm.S
@@ -98,7 +98,6 @@ ENTRY(mrst_s0i3_entry)
/* If MWAIT wakes us up, assume something happened... */
cli
- /* jmp simulate_resume */
movl %ebp, %esp
xorl %eax, %eax /* Not really S0i3 */
@@ -110,30 +109,6 @@ ENTRY(mrst_s0i3_entry)
ENDPROC(mrst_s0i3_entry)
/*
- * Hack for testing: simulate a wakeup
- */
-simulate_resume:
- movl $pa(initial_page_table), %eax
- movl %eax, %cr3
- ljmpl $(__KERNEL_CS), $pa(1f)
-1:
- movl %cr0, %eax
- andl $~0x80000000, %eax
- movl %eax, %cr0 /* Disable paging */
-
- xorl %eax, %eax
- movl %eax, %cr3
- movl %eax, %cr4
-
- xorl %edx, %edx
- movl $(MSR_EFER), %ecx
- wrmsr
-
- lldt %ax
- movl %eax, %esp
-
- /* Fall through */
-/*
* After S0i3 the MRST firmare will put us back in 32-bit flat mode
*/
ENTRY(mrst_s0i3_resume)