From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.36935.1640689084297423530 for ; Tue, 28 Dec 2021 02:58:04 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=nq1iCRjs; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640689084; x=1672225084; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qyEaafJqWE/dDFrMqYLTPI08e3040uYUkKekVq7bsrM=; b=nq1iCRjsWf+T1k23rfUA1tonFyrrFgiZQAtq/nV/KJZFQecgbcS2oRXS HtTXjqLZGvpkbSDWkxsz11cepJWj9S/UM2QdtXnHRKrDX7JRxEa6MOtM3 a/Ugf6oFzjJ+xexXaRppJlE+QpsjUhCmFjGP6OthZ7tThYoWwkQ+Cx7FI FL/d4YnAMDae0FjBbj0vKmBJDZMUHeqglq5e7LGpCFckZiGcqTRo6Lpj2 gY4KGbCpYlPwWGJHEQtHMI9B2eVmFM7MIOO//E1Og1Ygd7sMOvcT7n4AL b/Hhw5xGPTPPdPY9uCLa2o3L+U9/Gqu8C1VEHbFvDhj8IkQLMtMTRpwMa g==; X-IronPort-AV: E=McAfee;i="6200,9189,10210"; a="221349465" X-IronPort-AV: E=Sophos;i="5.88,242,1635231600"; d="scan'208";a="221349465" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2021 02:58:03 -0800 X-IronPort-AV: E=Sophos;i="5.88,242,1635231600"; d="scan'208";a="469998605" Received: from cchiu4-mobl.gar.corp.intel.com ([10.252.191.109]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2021 02:58:01 -0800 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Chasel Chiu , Maurice Ma , Nate DeSimone , Star Zeng Subject: [PATCH] IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed. Date: Tue, 28 Dec 2021 18:57:49 +0800 Message-Id: <20211228105749.1934-1-chasel.chiu@intel.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3791 ExtendedImageRevision should be printed when Header revision >=3D 6. Cc: Maurice Ma Cc: Nate DeSimone Cc: Star Zeng Signed-off-by: Chasel Chiu --- IntelFsp2Pkg/FspSecCore/SecFsp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/Sec= Fsp.c index ae03fa228e..f79d45900e 100644 --- a/IntelFsp2Pkg/FspSecCore/SecFsp.c +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c @@ -1,6 +1,6 @@ /** @file=0D =0D - Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -199,8 +199,12 @@ FspGlobalDataInit ( ImageId, \=0D (PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \=0D (PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \=0D - (PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF, \=0D - PeiFspData->FspInfoHeader->ImageRevision & 0xFF=0D + (PeiFspData->FspInfoHeader->HeaderRevision >=3D 6) ? \=0D + (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | (PeiFspD= ata->FspInfoHeader->ExtendedImageRevision & 0xFF00)) :\=0D + ((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF), \=0D + (PeiFspData->FspInfoHeader->HeaderRevision >=3D 6) ? \=0D + ((PeiFspData->FspInfoHeader->ImageRevision & 0xFF) | ((PeiFspData->F= spInfoHeader->ExtendedImageRevision & 0xFF) << 8)): \=0D + (PeiFspData->FspInfoHeader->ImageRevision & 0xFF)=0D ));=0D }=0D =0D --=20 2.28.0.windows.1