From 28319270fbc71781e9710ac3357e3093cdb20aab Mon Sep 17 00:00:00 2001
From: geekboy15a <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 27 Jan 2010 22:45:14 +0000
Subject: [PATCH] Fixed GDT load issue in some cases after a reset.  Only CS
 should be used to access flash prior to entering protected mode.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9839 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Bin/ResetVector.ia32.port80.raw           | Bin 500 -> 500 bytes
 OvmfPkg/ResetVector/Bin/ResetVector.ia32.raw  | Bin 484 -> 484 bytes
 .../Bin/ResetVector.ia32.serial.raw           | Bin 884 -> 884 bytes
 .../Bin/ResetVector.x64.port80.raw            | Bin 28676 -> 28676 bytes
 OvmfPkg/ResetVector/Bin/ResetVector.x64.raw   | Bin 28676 -> 28676 bytes
 .../Bin/ResetVector.x64.serial.raw            | Bin 28676 -> 28676 bytes
 OvmfPkg/ResetVector/Ia16/16RealTo32Flat.asm   |   2 +-
 7 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.ia32.port80.raw b/OvmfPkg/ResetVector/Bin/ResetVector.ia32.port80.raw
index c071f1afaf8ca65796a93ea1feecabf486f188e8..3a8a46d17265364917572a83248743cf60d1c301 100644
GIT binary patch
delta 65
zcmV-H0KWh91M~y1Qvo$DW)A@uX1F5&06-5Sz-H=o|Ns9G0JuN~000jn;IK00fM&P|
X0FKy>z>eUK=#J3oIsgCwlZXLqE36tt

delta 38
ucmeyu{DpZ#Frz>kKcjfs4rK-g2Y#gkX|GBqr!Xq8S~D;(Oqkrkm;(Uj3JW#>

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.ia32.raw b/OvmfPkg/ResetVector/Bin/ResetVector.ia32.raw
index 97e639ab7005626950c3519df2186788b6de42e1..7379cb7b30f367fce2fe2463ed9f57f20b49df9a 100644
GIT binary patch
delta 38
ucmaFD{DgUfJ)@vr8b70W+74v~1_yqn18J`cC;KzXusAU=Fib9BECB%84+?t#

delta 38
ucmaFD{DgUfJ)=MxKcjfs4rK-g2Y#gkX|D<<2QbR8Ix{dZOqg82SONguathu6

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.ia32.serial.raw b/OvmfPkg/ResetVector/Bin/ResetVector.ia32.serial.raw
index c775900fbf960fc082afba1cfd748710967cc0a4..4b7278463bfef7bd9fee94bac4ad744f76481a78 100644
GIT binary patch
delta 47
zcmV+~0MP&R2J{B7kOC8s|1M?^0T*VtBLDzE4<f*3>NJz00$dA10001x7XYCD|NoN;
F18R}v5V!yU

delta 47
zcmV+~0MP&R2J{B7kOC5p|7H&X7iPF4002M_BEV+qGn1nNTns}1000*Np#T5>kdTuK
F18SJE5g7mg

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.x64.port80.raw b/OvmfPkg/ResetVector/Bin/ResetVector.x64.port80.raw
index 09c911707269be5f46ea0a75caca5338411aab4f..487d815670e1d693df6736e6a746a08830345932 100644
GIT binary patch
delta 49
zcmZp9z}WJDaf4O9aNd8tG=4_$v>nO}3=aHC2hv{oP4>xG;Pzx-V3;7!(D48N|H&2k
FJpj6A5@P@W

delta 49
zcmZp9z}WJDaf4O9P|p7}en#=M9m)(04*W_7(q8#a_RUw|@nT?LkY{N4|NsAl36m@G
FdjP=!62t%i

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw b/OvmfPkg/ResetVector/Bin/ResetVector.x64.raw
index 4b98137b1dfa6752d00b826ef32c8a89941b9e28..1f4e9fcb8333ea00e4d7bbdb8b5634591409f210 100644
GIT binary patch
delta 72
zcmZp9z}WJDaf4I7RndRFG=4_$v>nO}3=aHC2hv`J{r~@8fMJIN8v_Hs(u1@e91MLo
c`VRCx=zGz3;iW4B1H%M)h6bRT$u;>M04Pl#LI3~&

delta 72
zcmZp9z}WJDaf4I7Rl)x>en#=M9m)(04*W_7(q4uB|NmcrVTS`70|UR(gR~tS41G8H
c4)i_fd(n5{r5ghSgFHh6P|1V|lWX!j05>lmq5uE@

diff --git a/OvmfPkg/ResetVector/Bin/ResetVector.x64.serial.raw b/OvmfPkg/ResetVector/Bin/ResetVector.x64.serial.raw
index dfbb4f46d3ba9124e2dbe04646fa27263ed23b5b..9b08b317ce6768e81096c6620bfb1513f4381a78 100644
GIT binary patch
delta 40
wcmZp9z}WJDaRYn4pk5k3qj=g5Wd;TZex(CxuOugn=f|+PGB7YquE_5J00?soTmS$7

delta 40
wcmZp9z}WJDaRYn4KpH=zc-jtS1_lRyr2}cNBqmGb$FRCFFfdG*T#?@c01NjFzW@LL

diff --git a/OvmfPkg/ResetVector/Ia16/16RealTo32Flat.asm b/OvmfPkg/ResetVector/Ia16/16RealTo32Flat.asm
index adf049cf77..3139ff50cb 100644
--- a/OvmfPkg/ResetVector/Ia16/16RealTo32Flat.asm
+++ b/OvmfPkg/ResetVector/Ia16/16RealTo32Flat.asm
@@ -32,7 +32,7 @@ TransitionFromReal16To32BitFlat:
 
     mov     bx, ADDR16_OF(gdtr)
 
-o32 lgdt    [bx]
+o32 lgdt    [cs:bx]
 
     mov     eax, SEC_DEFAULT_CR0
     mov     cr0, eax
-- 
2.39.2