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: 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
 .../ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw | Bin 28676 -> 28676 bytes
 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw | Bin 28676 -> 28676 bytes
 .../ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw | Bin 28676 -> 28676 bytes
 .../ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm       |   5 +++--
 7 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'UefiCpuPkg')

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw
index 3a8a46d172..ec6bcfd48b 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw differ
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw
index 7379cb7b30..02cb66c848 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw differ
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw
index 4b7278463b..58542ad9d1 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw differ
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw
index 487d815670..393b6ef2ca 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw differ
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw
index 1f4e9fcb83..7ab1161a21 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw differ
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw
index 9b08b317ce..f32e81ac12 100644
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw differ
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
-- 
cgit v1.2.3