From: Andy Shevchenko Date: Mon, 17 Feb 2020 15:30:12 +0000 (+0200) Subject: Revert "x86: use invd instead of wbinvd in real mode start code" X-Git-Tag: v2020.04-rc4~22^2~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa97ca161beb13a46a304f3c9824cdf0826dda0e;p=oweals%2Fu-boot.git 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 Acked-by: Bin Meng [bmeng: fix a typo in the commit message] Signed-off-by: Bin Meng --- 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