diff options
| author | Kuo, Ted <ted.kuo@intel.com> | 2022-03-17 16:38:32 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-03-28 02:14:36 +0000 |
| commit | 3ef2071927fa8a206556e878491f772e44a3132e (patch) | |
| tree | fd73918eab525a36426e080d0224d0dbf5277457 /UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm | |
| parent | ec30a4a0c324cf24f1824ab5169923f854986798 (diff) | |
| download | edk2-3ef2071927fa8a206556e878491f772e44a3132e.tar.gz edk2-3ef2071927fa8a206556e878491f772e44a3132e.tar.bz2 edk2-3ef2071927fa8a206556e878491f772e44a3132e.zip | |
UefiCpuPkg: Update BFV searching algorithm in VTF0
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3870
The new algorithm searches FFS3 GUID first and then FFS2 GUID at
every 4KB address in the top 16MB just below 4GB.
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Reviewed-by: Min Xu <min.m.xu@intel.com>
Signed-off-by: Ted Kuo <ted.kuo@intel.com>
Diffstat (limited to 'UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm')
| -rw-r--r-- | UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm index 786239325d..60f3f2e0bd 100644 --- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm +++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm @@ -2,7 +2,7 @@ ; @file
; Search for the Boot Firmware Volume (BFV) base address
;
-; Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>
; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;------------------------------------------------------------------------------
@@ -32,7 +32,6 @@ BITS 32 Flat32SearchForBfvBase:
xor eax, eax
- mov ecx, 3 ; 3: FFS3 GUID, 2: FFS2 GUID, 1: Not Found
searchingForBfvHeaderLoop:
;
; We check for a firmware volume at every 4KB address in the top 16MB
@@ -40,21 +39,19 @@ searchingForBfvHeaderLoop: ;
sub eax, 0x1000
cmp eax, 0xff000000
- jb searchingForBfvWithOtherFfsGuid
- cmp ecx, 3
- jne searchingForFfs2Guid
+ jb searchedForBfvHeaderButNotFound
;
; Check FFS3 GUID
;
cmp dword [eax + 0x10], FFS3_GUID_DWORD0
- jne searchingForBfvHeaderLoop
+ jne searchingForFfs2Guid
cmp dword [eax + 0x14], FFS3_GUID_DWORD1
- jne searchingForBfvHeaderLoop
+ jne searchingForFfs2Guid
cmp dword [eax + 0x18], FFS3_GUID_DWORD2
- jne searchingForBfvHeaderLoop
+ jne searchingForFfs2Guid
cmp dword [eax + 0x1c], FFS3_GUID_DWORD3
- jne searchingForBfvHeaderLoop
+ jne searchingForFfs2Guid
jmp checkingFvLength
searchingForFfs2Guid:
@@ -82,12 +79,6 @@ checkingFvLength: jmp searchedForBfvHeaderAndItWasFound
-searchingForBfvWithOtherFfsGuid:
- xor eax, eax
- dec ecx
- cmp ecx, 1
- jne searchingForBfvHeaderLoop
-
searchedForBfvHeaderButNotFound:
;
; Hang if the SEC entry point was not found
|