[edk2-devel] [PATCH v2] IntelFsp2Pkg: FSPM_ARCH2_UPD mismatching bug.

[Zeng, Star]

Reviewed-by: Star Zeng <star.zeng at intel.com>

-----Original Message-----
From: Chiu, Chasel <chasel.chiu at intel.com> 
Sent: Monday, August 15, 2022 2:23 PM
To: devel at edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu at intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Zeng, Star <star.zeng at intel.com>
Subject: [PATCH v2] IntelFsp2Pkg: FSPM_ARCH2_UPD mismatching bug.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4019

FSPM_ARCH2_UPD in FspApiEntryM.nasm was not up-to-date and
should be fixed for both IA32 and X64 builds.

Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Star Zeng <star.zeng at intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu at intel.com>
---
 IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 3 ++-
 IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
index 5dada2af54..61ab4612a3 100644
--- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
+++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
@@ -40,12 +40,13 @@ struc FSPM_UPD_COMMON_FSP24
     .Revision:                  resb  1

     .Reserved:                  resb  3

     .Length                     resd  1

+    .NvsBufferPtr               resq  1

     .StackBase:                 resq  1

     .StackSize:                 resq  1

     .BootLoaderTolumSize:       resd  1

     .BootMode:                  resd  1

     .FspEventHandler            resq  1

-    .Reserved1:                 resb 24

+    .Reserved1:                 resb 16

     ; }

     .size:

 endstruc

diff --git a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm
index dacf515845..2d2f75b1f0 100644
--- a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm
+++ b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm
@@ -22,12 +22,13 @@ struc FSPM_UPD_COMMON_FSP24
     .Revision:                  resb  1

     .Reserved:                  resb  3

     .Length                     resd  1

+    .NvsBufferPtr               resq  1

     .StackBase:                 resq  1

     .StackSize:                 resq  1

     .BootLoaderTolumSize:       resd  1

     .BootMode:                  resd  1

     .FspEventHandler            resq  1

-    .Reserved1:                 resb 24

+    .Reserved1:                 resb 16

     ; }

     .size:

 endstruc

-- 
2.35.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92418): https://edk2.groups.io/g/devel/message/92418
Mute This Topic: https://groups.io/mt/93031167/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-