From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web11.9363.1616744201579061561 for ; Fri, 26 Mar 2021 00:36:45 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: ray.ni@intel.com) IronPort-SDR: UoJas344sp09085wuZztFeG/TlDEAvIZ5Is7EqYC4cjuEAgFWHMw0i33R2WEeWHByzzg9uiaU7 WoGcVS+0h3aA== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="252453133" X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="252453133" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2021 00:36:43 -0700 IronPort-SDR: VYIP7ysQhV/LZX/RdT5U6WCiS6E1BFnT2GAcZAOCD/RbN2Ttb13Q48ir+KHFEd/5OQVFvG5tD/ 9UqJFzXTmy0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="608800412" Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga005.fm.intel.com with ESMTP; 26 Mar 2021 00:36:41 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone , Liming Gao , Eric Dong Subject: [PATCH 2/3] MinPlatformPkg: Use the microcode PCDs defined in IntelSiliconPkg Date: Fri, 26 Mar 2021 15:36:28 +0800 Message-Id: <20210326073629.1383-3-ray.ni@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20210326073629.1383-1-ray.ni@intel.com> References: <20210326073629.1383-1-ray.ni@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The microcode PCDs in MinPlatformPkg will be removed in a separate patch. Signed-off-by: Ray Ni Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong --- .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 7 ++++--- .../Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf | 7 ++++--- .../SecFspWrapperPlatformSecLib.inf | 9 +++++---- .../Library/SecFspWrapperPlatformSecLib/SecRamInitData.c | 6 +++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServic= eSmm.inf b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceS= mm.inf index 10e51e11..0028cc99 100644 --- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf +++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf @@ -1,7 +1,7 @@ ### @file=0D # Component description file for the Serial Flash device Runtime driver.=0D #=0D -# Copyright (c) 2017-2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2017-2021, Intel Corporation. All rights reserved.
=0D # Copyright (c) Microsoft Corporation.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -38,6 +38,7 @@ [Packages]=0D MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D + IntelSiliconPkg/IntelSiliconPkg.dec=0D MinPlatformPkg/MinPlatformPkg.dec=0D =0D [Pcd]=0D @@ -45,8 +46,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize ## CONSUM= ES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize ## CONSUM= ES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize ## CONSUM= ES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUM= ES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUM= ES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUM= ES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUM= ES=0D =0D [Sources]=0D FvbInfo.c=0D diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServic= eStandaloneMm.inf b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFv= bServiceStandaloneMm.inf index 9f08d367..8071c6b7 100644 --- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceStanda= loneMm.inf +++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceStanda= loneMm.inf @@ -1,7 +1,7 @@ ### @file=0D # Component description file for the Serial Flash device Standalone MM dri= ver.=0D #=0D -# Copyright (c) 2017-2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2017-2021, Intel Corporation. All rights reserved.
=0D # Copyright (c) Microsoft Corporation.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -37,6 +37,7 @@ [Packages]=0D MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D + IntelSiliconPkg/IntelSiliconPkg.dec=0D MinPlatformPkg/MinPlatformPkg.dec=0D =0D [Pcd]=0D @@ -44,8 +45,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize ## CONSUM= ES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize ## CONSUM= ES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize ## CONSUM= ES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUM= ES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUM= ES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## CONSUM= ES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize ## CONSUM= ES=0D =0D [Sources]=0D FvbInfo.c=0D diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapper= PlatformSecLib/SecFspWrapperPlatformSecLib.inf b/Platform/Intel/MinPlatform= Pkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSec= Lib.inf index 4f3fa9fa..9fe5960b 100644 --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor= mSecLib/SecFspWrapperPlatformSecLib.inf +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor= mSecLib/SecFspWrapperPlatformSecLib.inf @@ -1,7 +1,7 @@ ## @file=0D # Provide FSP wrapper platform sec related function.=0D #=0D -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
= =0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -62,6 +62,7 @@ UefiCpuPkg/UefiCpuPkg.dec=0D IntelFsp2Pkg/IntelFsp2Pkg.dec=0D IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec=0D + IntelSiliconPkg/IntelSiliconPkg.dec=0D MinPlatformPkg/MinPlatformPkg.dec=0D =0D [LibraryClasses]=0D @@ -88,9 +89,9 @@ gMinPlatformPkgTokenSpaceGuid.PcdSecSerialPortDebugEnable ## C= ONSUMES=0D =0D [FixedPcd]=0D - gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress ## C= ONSUMES=0D - gIntelFsp2WrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize ## C= ONSUMES=0D - gIntelFsp2WrapperTokenSpaceGuid.PcdFlashMicrocodeOffset ## C= ONSUMES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## C= ONSUMES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize ## C= ONSUMES=0D + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeOffset ## C= ONSUMES=0D gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress ## C= ONSUMES=0D gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize ## C= ONSUMES=0D gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress ## C= ONSUMES=0D diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapper= PlatformSecLib/SecRamInitData.c b/Platform/Intel/MinPlatformPkg/FspWrapper/= Library/SecFspWrapperPlatformSecLib/SecRamInitData.c index b356327b..b4e10cca 100644 --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor= mSecLib/SecRamInitData.c +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor= mSecLib/SecRamInitData.c @@ -1,7 +1,7 @@ /** @file=0D Provide TempRamInitParams data.=0D =0D -Copyright (c) 2017, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -24,8 +24,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA Fs= ptUpdDataPtr =3D { }=0D },=0D {=0D - ((UINT32)FixedPcdGet64 (PcdCpuMicrocodePatchAddress) + FixedPcdGet32 (= PcdFlashMicrocodeOffset)),=0D - ((UINT32)FixedPcdGet64 (PcdCpuMicrocodePatchRegionSize) - FixedPcdGet3= 2 (PcdFlashMicrocodeOffset)),=0D + FixedPcdGet32 (PcdFlashFvMicrocodeBase) + FixedPcdGet32 (PcdFlashMicro= codeOffset),=0D + FixedPcdGet32 (PcdFlashFvMicrocodeSize) - FixedPcdGet32 (PcdFlashMicro= codeOffset),=0D 0, // Set CodeRegionBase as 0, so that caching will be 4GB-(C= odeRegionSize > LLCSize ? LLCSize : CodeRegionSize) will be used.=0D FixedPcdGet32 (PcdFlashCodeCacheSize),=0D { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,=0D --=20 2.27.0.windows.1