Revert "x86: use invd instead of wbinvd in real mode start code"

This reverts commit 0d67fac29f3187e67f4fd3ef15f73e91be2fad12.

As real hardware testing (*) shows the above mentioned commit
breaks U-Boot on it. Revert for the upcoming release. We may get
more information in the future and optimize the code accordingly.

(*) on Intel Edison board.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: fix a typo in the commit message]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index 26cf995db2d01c8eb5475ee47070ad1aab2c13ae..01524635e9c82d9a498653605dc36d2107ea8d90 100644 (file)
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -50,7 +50,7 @@ _x86boot_start:
        movl    %cr0, %eax
        orl     $(X86_CR0_NW | X86_CR0_CD), %eax
        movl    %eax, %cr0
-       invd
+       wbinvd
 
        /*
         * Zero the BIST (Built-In Self Test) value since we don't have it.

diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S
index 292e750508149aae68770160f1a39090a12a9912..54f4ff6662a8d8999311be3e7553882b1b245c2a 100644 (file)
--- a/arch/x86/cpu/start16.S
+++ b/arch/x86/cpu/start16.S
@@ -28,7 +28,7 @@ start16:
        movl    %cr0, %eax
        orl     $(X86_CR0_NW | X86_CR0_CD), %eax
        movl    %eax, %cr0
-       invd
+       wbinvd
 
        /* load the temporary Global Descriptor Table */
 data32 cs      lidt    idt_ptr