UefiCpuPkg: Support FFS3 GUID in SearchForBfvBase.asm

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3862
The new algorithm searches BFV address with FFS3 GUID first.
If not found, it will search BFV address with FFS2 GUID.

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>
Signed-off-by: Ted Kuo <ted.kuo@intel.com>

10 files changed, 41 insertions, 10 deletions

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
index 79b23c047b..23254e83bf 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
index ce7faa502b..18562d8f1f 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
index 6503a988ab..e4aa4fc30a 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw
index 279ba03b0c..51ad3ecde0 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw
index 9b09a80f22..eec88b1c9c 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw
index d9b051ff06..de97b858dd 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw
index 0e53a574fa..23c58501b5 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw
index 865846da42..3438dabefe 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw
index f1d6536cec..5ee3012482 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
index 10f8e3e8bb..786239325d 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
@@ -9,10 +9,17 @@
 

 ;#define EFI_FIRMWARE_FILE_SYSTEM2_GUID \

 ;  { 0x8c8ce578, 0x8a3d, 0x4f1c, { 0x99, 0x35, 0x89, 0x61, 0x85, 0xc3, 0x2d, 0xd3 } }

-%define FFS_GUID_DWORD0 0x8c8ce578

-%define FFS_GUID_DWORD1 0x4f1c8a3d

-%define FFS_GUID_DWORD2 0x61893599

-%define FFS_GUID_DWORD3 0xd32dc385

+%define FFS2_GUID_DWORD0 0x8c8ce578

+%define FFS2_GUID_DWORD1 0x4f1c8a3d

+%define FFS2_GUID_DWORD2 0x61893599

+%define FFS2_GUID_DWORD3 0xd32dc385

+

+;#define EFI_FIRMWARE_FILE_SYSTEM3_GUID \

+;  { 0x8c8ce578, 0x3dcb, 0x4dca, { 0xbd, 0x6f, 0x1e, 0x96, 0x89, 0xe7, 0x34, 0x9a } }

+%define FFS3_GUID_DWORD0 0x5473c07a

+%define FFS3_GUID_DWORD1 0x4dca3dcb

+%define FFS3_GUID_DWORD2 0x961e6fbd

+%define FFS3_GUID_DWORD3 0x9a34e789

 

 BITS    32

 

@@ -25,6 +32,7 @@ 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

@@ -32,20 +40,37 @@ searchingForBfvHeaderLoop:
     ;

     sub     eax, 0x1000

     cmp     eax, 0xff000000

-    jb      searchedForBfvHeaderButNotFound

+    jb      searchingForBfvWithOtherFfsGuid

+    cmp     ecx, 3

+    jne     searchingForFfs2Guid

 

     ;

-    ; Check FFS GUID

+    ; Check FFS3 GUID

     ;

-    cmp     dword [eax + 0x10], FFS_GUID_DWORD0

+    cmp     dword [eax + 0x10], FFS3_GUID_DWORD0

     jne     searchingForBfvHeaderLoop

-    cmp     dword [eax + 0x14], FFS_GUID_DWORD1

+    cmp     dword [eax + 0x14], FFS3_GUID_DWORD1

     jne     searchingForBfvHeaderLoop

-    cmp     dword [eax + 0x18], FFS_GUID_DWORD2

+    cmp     dword [eax + 0x18], FFS3_GUID_DWORD2

     jne     searchingForBfvHeaderLoop

-    cmp     dword [eax + 0x1c], FFS_GUID_DWORD3

+    cmp     dword [eax + 0x1c], FFS3_GUID_DWORD3

     jne     searchingForBfvHeaderLoop

+    jmp     checkingFvLength

 

+searchingForFfs2Guid:

+    ;

+    ; Check FFS2 GUID

+    ;

+    cmp     dword [eax + 0x10], FFS2_GUID_DWORD0

+    jne     searchingForBfvHeaderLoop

+    cmp     dword [eax + 0x14], FFS2_GUID_DWORD1

+    jne     searchingForBfvHeaderLoop

+    cmp     dword [eax + 0x18], FFS2_GUID_DWORD2

+    jne     searchingForBfvHeaderLoop

+    cmp     dword [eax + 0x1c], FFS2_GUID_DWORD3

+    jne     searchingForBfvHeaderLoop

+

+checkingFvLength:

     ;

     ; Check FV Length

     ;

@@ -57,6 +82,12 @@ searchingForBfvHeaderLoop:
 

     jmp     searchedForBfvHeaderAndItWasFound

 

+searchingForBfvWithOtherFfsGuid:

+    xor     eax, eax

+    dec     ecx

+    cmp     ecx, 1

+    jne     searchingForBfvHeaderLoop

+

 searchedForBfvHeaderButNotFound:

     ;

     ; Hang if the SEC entry point was not found