UefiCpuPkg: Support FFS3 GUID in SearchForBfvBase.asm

[mirror_edk2.git] / UefiCpuPkg / ResetVector / Vtf0 / Ia32 / SearchForBfvBase.asm

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
index 10f8e3e8bbfeff88b98172e2f70da32987fc4ca1..786239325dc7d1c49955f5477873c11fb425a851 100644 (file)
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm
@@ -9,10 +9,17 @@
 \r
 ;#define EFI_FIRMWARE_FILE_SYSTEM2_GUID \\r
 ;  { 0x8c8ce578, 0x8a3d, 0x4f1c, { 0x99, 0x35, 0x89, 0x61, 0x85, 0xc3, 0x2d, 0xd3 } }\r
-%define FFS_GUID_DWORD0 0x8c8ce578\r
-%define FFS_GUID_DWORD1 0x4f1c8a3d\r
-%define FFS_GUID_DWORD2 0x61893599\r
-%define FFS_GUID_DWORD3 0xd32dc385\r
+%define FFS2_GUID_DWORD0 0x8c8ce578\r
+%define FFS2_GUID_DWORD1 0x4f1c8a3d\r
+%define FFS2_GUID_DWORD2 0x61893599\r
+%define FFS2_GUID_DWORD3 0xd32dc385\r
+\r
+;#define EFI_FIRMWARE_FILE_SYSTEM3_GUID \\r
+;  { 0x8c8ce578, 0x3dcb, 0x4dca, { 0xbd, 0x6f, 0x1e, 0x96, 0x89, 0xe7, 0x34, 0x9a } }\r
+%define FFS3_GUID_DWORD0 0x5473c07a\r
+%define FFS3_GUID_DWORD1 0x4dca3dcb\r
+%define FFS3_GUID_DWORD2 0x961e6fbd\r
+%define FFS3_GUID_DWORD3 0x9a34e789\r
 \r
 BITS    32\r
 \r
@@ -25,6 +32,7 @@ BITS    32
 Flat32SearchForBfvBase:\r
 \r
     xor     eax, eax\r
+    mov     ecx, 3    ; 3: FFS3 GUID, 2: FFS2 GUID, 1: Not Found\r
 searchingForBfvHeaderLoop:\r
     ;\r
     ; We check for a firmware volume at every 4KB address in the top 16MB\r
@@ -32,20 +40,37 @@ searchingForBfvHeaderLoop:
     ;\r
     sub     eax, 0x1000\r
     cmp     eax, 0xff000000\r
-    jb      searchedForBfvHeaderButNotFound\r
+    jb      searchingForBfvWithOtherFfsGuid\r
+    cmp     ecx, 3\r
+    jne     searchingForFfs2Guid\r
 \r
     ;\r
-    ; Check FFS GUID\r
+    ; Check FFS3 GUID\r
     ;\r
-    cmp     dword [eax + 0x10], FFS_GUID_DWORD0\r
+    cmp     dword [eax + 0x10], FFS3_GUID_DWORD0\r
     jne     searchingForBfvHeaderLoop\r
-    cmp     dword [eax + 0x14], FFS_GUID_DWORD1\r
+    cmp     dword [eax + 0x14], FFS3_GUID_DWORD1\r
     jne     searchingForBfvHeaderLoop\r
-    cmp     dword [eax + 0x18], FFS_GUID_DWORD2\r
+    cmp     dword [eax + 0x18], FFS3_GUID_DWORD2\r
     jne     searchingForBfvHeaderLoop\r
-    cmp     dword [eax + 0x1c], FFS_GUID_DWORD3\r
+    cmp     dword [eax + 0x1c], FFS3_GUID_DWORD3\r
     jne     searchingForBfvHeaderLoop\r
+    jmp     checkingFvLength\r
 \r
+searchingForFfs2Guid:\r
+    ;\r
+    ; Check FFS2 GUID\r
+    ;\r
+    cmp     dword [eax + 0x10], FFS2_GUID_DWORD0\r
+    jne     searchingForBfvHeaderLoop\r
+    cmp     dword [eax + 0x14], FFS2_GUID_DWORD1\r
+    jne     searchingForBfvHeaderLoop\r
+    cmp     dword [eax + 0x18], FFS2_GUID_DWORD2\r
+    jne     searchingForBfvHeaderLoop\r
+    cmp     dword [eax + 0x1c], FFS2_GUID_DWORD3\r
+    jne     searchingForBfvHeaderLoop\r
+\r
+checkingFvLength:\r
     ;\r
     ; Check FV Length\r
     ;\r
@@ -57,6 +82,12 @@ searchingForBfvHeaderLoop:
 \r
     jmp     searchedForBfvHeaderAndItWasFound\r
 \r
+searchingForBfvWithOtherFfsGuid:\r
+    xor     eax, eax\r
+    dec     ecx\r
+    cmp     ecx, 1\r
+    jne     searchingForBfvHeaderLoop\r
+\r
 searchedForBfvHeaderButNotFound:\r
     ;\r
     ; Hang if the SEC entry point was not found\r