[edk2-devel] [PATCH] IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.

[Chiu, Chasel]

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

ExtendedImageRevision should be printed when Header revision >= 6.

Cc: Maurice Ma <maurice...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Star Zeng <star.z...@intel.com>
Signed-off-by: Chasel Chiu <chasel.c...@intel.com>
---
 IntelFsp2Pkg/FspSecCore/SecFsp.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index ae03fa228e..f79d45900e 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -199,8 +199,12 @@ FspGlobalDataInit (
     ImageId, \
     (PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \
     (PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \
-    (PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF, \
-    PeiFspData->FspInfoHeader->ImageRevision & 0xFF
+    (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \
+      (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | 
(PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF00)) :\
+        ((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF), \
+    (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \
+      ((PeiFspData->FspInfoHeader->ImageRevision & 0xFF) | 
((PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF) << 8)): \
+        (PeiFspData->FspInfoHeader->ImageRevision & 0xFF)
     ));
 }
 
-- 
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85221): https://edk2.groups.io/g/devel/message/85221
Mute This Topic: https://groups.io/mt/87993533/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-