From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=benjamin.you@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0D6DC211B7F83 for ; Tue, 15 Jan 2019 21:22:06 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jan 2019 21:22:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,484,1539673200"; d="scan'208";a="134996454" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2019 21:22:05 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 15 Jan 2019 21:22:05 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 15 Jan 2019 21:22:05 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.150]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.239]) with mapi id 14.03.0415.000; Wed, 16 Jan 2019 13:22:05 +0800 From: "You, Benjamin" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Ma, Maurice" , "Agyeman, Prince" Thread-Topic: [PATCH V3 16/17] CorebootPayloadPkg: Use merged variable driver for emulated NV mode Thread-Index: AQHUrL1NbnGGLX2F8U2ENelpC8GXf6WxXQsQ Date: Wed, 16 Jan 2019 05:22:05 +0000 Message-ID: References: <1547548179-42552-1-git-send-email-star.zeng@intel.com> <1547548179-42552-17-git-send-email-star.zeng@intel.com> In-Reply-To: <1547548179-42552-17-git-send-email-star.zeng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjljMGNhMmUtODViZS00ZTNkLWIwMWYtODk5NTE3ODY3YzFkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMitFVXdNeWZxQ2ErUHAzem1HbFNKeTZlVk85OWs1U1huR25lWHRDTUR5bHNHS3ZYUmYzQ1l5TjBYYnc4UjhDMiJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V3 16/17] CorebootPayloadPkg: Use merged variable driver for emulated NV mode X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 05:22:07 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Benjamin You > -----Original Message----- > From: Zeng, Star > Sent: Tuesday, January 15, 2019 6:30 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Ma, Maurice ; > Agyeman, Prince ; You, Benjamin > > Subject: [PATCH V3 16/17] CorebootPayloadPkg: Use merged variable driver = for > emulated NV mode >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1323 > Merge EmuVariable and Real variable driver. >=20 > The real variable driver has been updated to support emulated > variable NV mode and the EmuVariableRuntimeDxe will be removed > later, so use merged variable driver for emulated NV mode. >=20 > Cc: Maurice Ma > Cc: Prince Agyeman > Cc: Benjamin You > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > CorebootPayloadPkg/CorebootPayloadPkg.fdf | 4 ++-- > CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 11 +++++++++-- > CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 11 +++++++++-- > 3 files changed, 20 insertions(+), 6 deletions(-) >=20 > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > index 741a5c232ed8..0c24f96a1561 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -109,7 +109,7 @@ [FV.DXEFV] > INF > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf > INF > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f > INF > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > -INF > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > +INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >=20 > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > index 467d4fcdb422..98d6073866f0 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -203,6 +203,9 @@ [LibraryClasses] >=20 > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDe > bugLibReportStatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i= nf > + > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibN > ull.inf > + > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmM > easurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >=20 > [LibraryClasses.IA32.SEC] > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > @@ -277,6 +280,10 @@ [PcdsFixedAtBuild] > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000 > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000 > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, > 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0= x23, > 0x31 } > @@ -417,7 +424,7 @@ [Components.IA32] >=20 > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf >=20 > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f >=20 > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > - > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >=20 > # > # Following are the DXE drivers > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > index 673bd26c7973..608a288c425f 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -203,6 +203,9 @@ [LibraryClasses] >=20 > DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDe > bugLibReportStatusCode.inf > LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i= nf > + > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibN > ull.inf > + > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmM > easurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >=20 > [LibraryClasses.IA32.SEC] > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > @@ -277,6 +280,10 @@ [PcdsFixedAtBuild] > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000 > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000 > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 > gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE > @@ -418,7 +425,7 @@ [Components.X64] >=20 > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterR > untimeDxe.inf >=20 > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.in > f >=20 > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe > .inf > - > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.i > nf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >=20 > # > # Following are the DXE drivers > -- > 2.7.0.windows.1