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>

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
index 79b23c047bdc6e552d77d5c9e9aeae21ff04d91d..23254e83bf1a17dee9f38c235fcc9948624a7536 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw differ

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
index ce7faa502b858e99908bcdb397b776258205e1d5..18562d8f1f58601f66fcb0cbf2f994046ce48fde 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw differ

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
index 6503a988abdac06f9aa88f0a65f2525e12233b0a..e4aa4fc30a32bc3d4d8d0e1726c43fdafef4a374 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw differ

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 279ba03b0c01f552a0d3ed8900e06b91f2555901..51ad3ecde0e4e02e91ed299ec207e9f7460524b3 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.port80.raw differ

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw
index 9b09a80f225736a413b7146b0e7bd4aafc73abe1..eec88b1c9cbd2f87951762b6db2be79c8dd73656 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw differ

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 d9b051ff06d1d30b0dfd585e05e75c98ebd88b03..de97b858ddd03171114aa0efb1929796b1aa5435 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x64.serial.raw differ

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 0e53a574fab74db6973d7ea41a6a495266a4d0ae..23c58501b5a48448ffcd2757310442ef33f45fa0 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.port80.raw differ

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw
index 865846da42a45c16b69746f16963d47a6c6e71b0..3438dabefee950826a0541e9549f48311f194d43 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw differ

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 f1d6536cec924d0e167cf1ee4e9309ed5fd7ad60..5ee3012482de343cfae8af590a49170c5b7f1d65 100644 (file)
Binary files a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw and b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x64.serial.raw differ

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