IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.

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

ExtendedImageRevision should be printed when Header revision >= 6.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

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