diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-02-17 17:30:12 +0200 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-03-05 18:19:40 +0800 |
| commit | fa97ca161beb13a46a304f3c9824cdf0826dda0e (patch) | |
| tree | bae1009710d58529b7a74796654a2ee2d262cb2b /arch/x86/cpu | |
| parent | 38a2a48cd9e4697cb8942e56212610d4248ea34c (diff) | |
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>
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/start.S | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/start16.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 26cf995db2..01524635e9 100644 --- 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 292e750508..54f4ff6662 100644 --- 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 |