From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.4425.1623289121529548874 for ; Wed, 09 Jun 2021 18:38:41 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: zhiguang.liu@intel.com) IronPort-SDR: qe2DOxAPhTcnOeE4K1HxIM771lavej2TuxmvgTMuswFO3jlfk7gKpnjh6vm0ZuQjSGdRTKA7Rj ZwjxgqePOFXw== X-IronPort-AV: E=McAfee;i="6200,9189,10010"; a="269060850" X-IronPort-AV: E=Sophos;i="5.83,262,1616482800"; d="scan'208";a="269060850" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 18:38:40 -0700 IronPort-SDR: KAl+GvymcclCcg1/admlhfwMOyqDU/SrpT9EHU3hQNebhOEq5D+pSorBkRjTyFZ/qH0yTY7KT4 vLvQ1H8+UGcQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,262,1616482800"; d="scan'208";a="402632147" Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by orsmga003.jf.intel.com with ESMTP; 09 Jun 2021 18:38:38 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You Subject: [Patch V3] UefiPayloadPkg: Use DynamicEx instead of Dynamic to pass PCD across binary Date: Thu, 10 Jun 2021 09:38:26 +0800 Message-Id: <20210610013826.1986-1-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable V1: When passing PCD database from Edk2 boot loader to Universal Payload, the l= ocal token number in boot loader PCD database can be different with that in Payl= oad PCD database. Dynamic PCD directly use local token number, while DynamicEx will search to= ken number by Guid and ExTokenNumber, which are unique pair and can make sure finding = the correct token number in boot loader's PCD database V2: Remove PCD PcdFlashNvStorageFtwWorkingBase and PcdFlashNvStorageFtwSpareBas= e, because they are not consumed by any modules. Explicitly define some PCDs as DynamicEx, or their default type will be Dyn= amic V3: Not remove some PCDs for they will be consumed soon Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: Zhiguang Liu --- UefiPayloadPkg/UefiPayloadPkg.dsc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 37ad5a0ae7..4b0ec3a059 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -336,11 +336,11 @@ =0D ##########################################################################= ######=0D #=0D -# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Pla= tform=0D +# Pcd DynamicEx Section - list of all EDK II PCD Entries defined by this P= latform=0D #=0D ##########################################################################= ######=0D =0D -[PcdsDynamicDefault]=0D +[PcdsDynamicExDefault]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0=0D @@ -363,6 +363,9 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase|0=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed|FALSE=0D + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0=0D =0D ##########################################################################= ######=0D #=0D --=20 2.30.0.windows.2