From 8332983e2e334c414eeca19b5742a9ec21194fb7 Mon Sep 17 00:00:00 2001
From: rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 4 Aug 2011 03:25:14 +0000
Subject: [PATCH] UefiCpuPkg: Replace the un-necessary WBINVD instruction at
 the reset vector with two NOPs in VTF0.

Signed-off-by: rsun3
Reviewed-by: mdkinney

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12085 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Vtf0/Bin/ResetVector.ia32.port80.raw      | Bin 500 -> 500 bytes
 .../ResetVector/Vtf0/Bin/ResetVector.ia32.raw | Bin 484 -> 484 bytes
 .../Vtf0/Bin/ResetVector.ia32.serial.raw      | Bin 884 -> 884 bytes
 .../Vtf0/Bin/ResetVector.x64.port80.raw       | Bin 28676 -> 28676 bytes
 .../ResetVector/Vtf0/Bin/ResetVector.x64.raw  | Bin 28676 -> 28676 bytes
 .../Vtf0/Bin/ResetVector.x64.serial.raw       | Bin 28676 -> 28676 bytes
 .../ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm |   5 +++--
 7 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw
index 3a8a46d17265364917572a83248743cf60d1c301..ec6bcfd48b1f71520c87f15fb3347eea72ff099f 100644
GIT binary patch
delta 24
Wcmeyu{DpbL6Gnjv6J8&gfCK=bU=1Sx

delta 24
Wcmeyu{DpbL6Gj1k&eumKAOQf7XABzv

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw
index 7379cb7b30f367fce2fe2463ed9f57f20b49df9a..02cb66c848ffc3bd8a8c574335d8b25425d3601b 100644
GIT binary patch
delta 24
WcmaFD{DgVK6-I#x6J8&gfCK=XPz>_`

delta 24
WcmaFD{DgVK6-EJm&eumKAOQf3R}1R^

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw
index 4b7278463bfef7bd9fee94bac4ad744f76481a78..58542ad9d1a151aafcce1e9446b449e8c48ec881 100644
GIT binary patch
delta 24
Wcmeyu_JwUj3bVk339pY#Kmq`lhzzR$

delta 24
Wcmeyu_JwUj3bOz|=j$UAkN^OOj|-y!

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw
index 487d815670e1d693df6736e6a746a08830345932..393b6ef2caa40a0cb882fe4cd1eeae9d5d841f68 100644
GIT binary patch
delta 26
YcmZp9z}WJDal@B<fe8~{ubF@Z0KQ8OWdHyG

delta 26
YcmZp9z}WJDal@B<0e;TcYbGE80IpIET>t<8

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw
index 1f4e9fcb8333ea00e4d7bbdb8b5634591409f210..7ab1161a210e24c310cd9dc660fa3adb2cf87750 100644
GIT binary patch
delta 26
YcmZp9z}WJDal@B<fe8~{ubF@Z0KQ8OWdHyG

delta 26
YcmZp9z}WJDal@B<0e;TcYbGE80IpIET>t<8

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw
index 9b08b317ce6768e81096c6620bfb1513f4381a78..f32e81ac12a2e9ca71dcb0b87165ecc358eb52f5 100644
GIT binary patch
delta 26
YcmZp9z}WJDal@B<fe8~{ubF@Z0KQ8OWdHyG

delta 26
YcmZp9z}WJDal@B<0e;TcYbGE80IpIET>t<8

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
index 3764b4ac8e..d0830ec87c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
@@ -2,7 +2,7 @@
 ; @file
 ; First code exectuted by processor after resetting.
 ;
-; Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
 ; This program and the accompanying materials
 ; are licensed and made available under the terms and conditions of the BSD License
 ; which accompanies this distribution.  The full text of the license may be found at
@@ -48,7 +48,8 @@ resetVector:
 ;
 ; This is where the processor will begin execution
 ;
-    wbinvd
+    nop
+    nop
     jmp     short EarlyBspInitReal16
 
 ALIGN   16
-- 
2.39.5