[PATCH v4 00/15] MdeModulePkg: Transfer reset data

[PATCH v4 00/15] MdeModulePkg: Transfer reset data

[Gao, Zhichao]

Indicate two guids gCapsuleArmedResetGuid and gCapsuleUpdateCompleteResetGuid
for capsule update. And define a struct which start with a null string and
followed by a EFI_GUID.

V2:
Add prefix Edkii to the new guids.
Move the new struct definition to ResetSystemLib.h.
Fix the wrong reset data to transfer.
Fix the comment of EfiResetSystem in RuntimeLib base on UEFI spec 2.8.

V3:
Drop 'Move the new struct definition to ResetSystemLib.h.' because the structure
would be only used in ResetUtilityLib
Using the API ResetSystemWithSubtype in ResetUtilityLib to transfer
a single GUID reset data.
Add ResetUtilityLib to the dsc files that contain CapsuleRuntimeDxe and
CapsuleLib (DxeCapsuleLib instance).

V4:
Format git config to show the [] section.
Fixed incorrect location of ResetUtilityLib in OvmfPkgIa32X64.dsc.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>


Bret Barkelew (3):
  MdeModulePkg: Add guids for capsule update
  MdeModulePkg/CapsuleRuntimeDxe: Transfer reset data
  MdeModulePkg/CapsuleLib: Transfer reset data

Zhichao Gao (12):
  MdeModulePkg: Add ResetUtilityLib to dsc file
  ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file
  ArmVritPkg/ArmVirtQemuKernel.dsc: Add ResetUtilityLib to dsc file
  ArmVirtPkg/ArmVirtXen.dsc: Add ResetUtilityLib to dsc file
  EmulatorPkg/EmulatorPkg.dsc: Add ResetUtilityLib to dsc file
  OvmfPkg/OvmfPkgIa32.dsc: Add ResetUtilityLib to dsc file
  OvmfPkg/OvmfPkgIa32X64.dsc: Add ResetUtilityLib to dsc file
  OvmfPkg/OvmfPkgX64.dsc: Add ResetUtilityLib to dsc file
  UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add ResetUtilityLib to dsc file
  UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc
  MdePkg/UefiRuntimeLib.h: Change the comment
  MdePkg/UefiRuntimeLib: Change the comment

 ArmVirtPkg/ArmVirtQemu.dsc                                | 1 +
 ArmVirtPkg/ArmVirtQemuKernel.dsc                          | 1 +
 ArmVirtPkg/ArmVirtXen.dsc                                 | 1 +
 EmulatorPkg/EmulatorPkg.dsc                               | 1 +
 MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf   | 2 ++
 .../Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c       | 3 ++-
 MdeModulePkg/MdeModulePkg.dec                             | 4 ++++
 MdeModulePkg/MdeModulePkg.dsc                             | 1 +
 .../Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf     | 2 ++
 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 2 +-
 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h | 3 ++-
 MdePkg/Include/Library/UefiRuntimeLib.h                   | 8 ++++----
 MdePkg/Library/UefiRuntimeLib/RuntimeLib.c                | 8 ++++----
 OvmfPkg/OvmfPkgIa32.dsc                                   | 2 ++
 OvmfPkg/OvmfPkgIa32X64.dsc                                | 1 +
 OvmfPkg/OvmfPkgX64.dsc                                    | 2 ++
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc                     | 2 ++
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                  | 2 ++
 18 files changed, 35 insertions(+), 11 deletions(-)

-- 
2.21.0.windows.1

[PATCH v4 01/15] MdeModulePkg: Add guids for capsule update

[Gao, Zhichao]

From: Bret Barkelew <Bret.Barkelew@microsoft.com>

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

And add two guids gEdkiiCapsuleArmedResetGuid and
gEdkiiCapsuleUpdateCompleteResetGuid for capsule
Update.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdeModulePkg/MdeModulePkg.dec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 12e0bbf57997..e7a71d3ab393 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -402,6 +402,10 @@ [Guids]
   ## GUID indicates the capsule is to store Capsule On Disk file names.
   gEdkiiCapsuleOnDiskNameGuid = { 0x98c80a4f, 0xe16b, 0x4d11, { 0x93, 0x9a, 0xab, 0xe5, 0x61, 0x26, 0x3, 0x30 } }
 
+  ## Guid to use for gRT->ResetSystem () to indicate the type of reset that is being performed.
+  gEdkiiCapsuleArmedResetGuid            = {0xc6b4eea7, 0xfce2, 0x4625, {0x9c, 0x4f, 0xc4, 0xb0, 0x82, 0x37, 0xae, 0x23}}
+  gEdkiiCapsuleUpdateCompleteResetGuid   = {0x5d512714, 0xa4df, 0x4e46, {0xb6, 0xc7, 0xbc, 0x9f, 0x97, 0x9d, 0x59, 0xa0}}
+
 [Ppis]
   ## Include/Ppi/AtaController.h
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
-- 
2.21.0.windows.1

[PATCH v4 02/15] MdeModulePkg: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdeModulePkg/MdeModulePkg.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 6ca7d9ade4e1..34e1910865f4 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -97,6 +97,7 @@ [LibraryClasses]
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
 [LibraryClasses.EBC.PEIM]
   IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
-- 
2.21.0.windows.1

[PATCH v4 03/15] ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 ArmVirtPkg/ArmVirtQemu.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 7ae6702ac1f0..4b8130f8e7fe 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -73,6 +73,7 @@ [LibraryClasses.common]
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
 [LibraryClasses.common.PEIM]
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
-- 
2.21.0.windows.1

Re: [PATCH v4 03/15] ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file

[Laszlo Ersek]

Hi,

On 08/12/19 05:07, Zhichao Gao wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1772
> 
> ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
> So add it for the platform dsc file.
> 
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  ArmVirtPkg/ArmVirtQemu.dsc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 7ae6702ac1f0..4b8130f8e7fe 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -73,6 +73,7 @@ [LibraryClasses.common]
>    PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
>    PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
>  
>  [LibraryClasses.common.PEIM]
>    ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
> 

thanks for updating your git config; these patches are a lot easier to read.

Under ArmVirtPkg, there are three platform DSC files that include
CapsuleRuntimeDxe:

- ArmVirtPkg/ArmVirtQemu.dsc
- ArmVirtPkg/ArmVirtQemuKernel.dsc
- ArmVirtPkg/ArmVirtXen.dsc

In this v4 patch series, the last platform above doesn't seem to be updated.

I suggest dropping patches #3 and #4 from the v4 series, and adding a
single patch that modifies "ArmVirtPkg/ArmVirt.dsc.inc".

Thanks
Laszlo

Re: [PATCH v4 03/15] ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file

[Laszlo Ersek]

On 08/12/19 15:49, Laszlo Ersek wrote:
> Hi,
> 
> On 08/12/19 05:07, Zhichao Gao wrote:
>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1772
>>
>> ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
>> So add it for the platform dsc file.
>>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> Cc: Liming Gao <liming.gao@intel.com>
>> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
>> ---
>>  ArmVirtPkg/ArmVirtQemu.dsc | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
>> index 7ae6702ac1f0..4b8130f8e7fe 100644
>> --- a/ArmVirtPkg/ArmVirtQemu.dsc
>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
>> @@ -73,6 +73,7 @@ [LibraryClasses.common]
>>    PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
>>    PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>> +  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
>>  
>>  [LibraryClasses.common.PEIM]
>>    ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
>>
> 
> thanks for updating your git config; these patches are a lot easier to read.
> 
> Under ArmVirtPkg, there are three platform DSC files that include
> CapsuleRuntimeDxe:
> 
> - ArmVirtPkg/ArmVirtQemu.dsc
> - ArmVirtPkg/ArmVirtQemuKernel.dsc
> - ArmVirtPkg/ArmVirtXen.dsc
> 
> In this v4 patch series, the last platform above doesn't seem to be updated.
> 
> I suggest dropping patches #3 and #4 from the v4 series, and adding a
> single patch that modifies "ArmVirtPkg/ArmVirt.dsc.inc".

When you update "ArmVirtPkg/ArmVirt.dsc.inc", please add the new
ResetUtilityLib class resolution just under the ResetSystemLib
resolution. (That one is also part of [LibraryClasses.common].)

Thanks
Laszlo

[PATCH v4 04/15] ArmVritPkg/ArmVirtQemuKernel.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 3b0f04967a4b..87c37a06e7fc 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -73,6 +73,7 @@ [LibraryClasses.common]
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-- 
2.21.0.windows.1

[PATCH v4 05/15] ArmVirtPkg/ArmVirtXen.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 ArmVirtPkg/ArmVirtXen.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 79304ee61d6d..279b246f85a5 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -47,6 +47,7 @@ [LibraryClasses]
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
 [LibraryClasses.common.UEFI_DRIVER]
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-- 
2.21.0.windows.1

[PATCH v4 06/15] EmulatorPkg/EmulatorPkg.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 EmulatorPkg/EmulatorPkg.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index ea8b6ce76e24..4ec88569bca0 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -111,6 +111,7 @@ [LibraryClasses]
   SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
 [LibraryClasses.common.SEC]
   PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
-- 
2.21.0.windows.1

[PATCH v4 07/15] OvmfPkg/OvmfPkgIa32.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 OvmfPkg/OvmfPkgIa32.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 6ab730018694..3dd9c0a3cd70 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -184,6 +184,8 @@ [LibraryClasses]
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 
   #
   # Network libraries
-- 
2.21.0.windows.1

[PATCH v4 08/15] OvmfPkg/OvmfPkgIa32X64.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index f163aa267132..a9f69eab8c06 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -189,6 +189,7 @@ [LibraryClasses]
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
 
   #
   # Network libraries
-- 
2.21.0.windows.1

Re: [PATCH v4 08/15] OvmfPkg/OvmfPkgIa32X64.dsc: Add ResetUtilityLib to dsc file

[Laszlo Ersek]

On 08/12/19 05:07, Zhichao Gao wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1772
> 
> ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
> So add it for the platform dsc file.
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index f163aa267132..a9f69eab8c06 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -189,6 +189,7 @@ [LibraryClasses]
>  !endif
>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>  
> +  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
>  
>    #
>    # Network libraries
> 

This patch is inconsistent with the other two OvmfPkg patches (different
amounts of whitespace are introduced).

However, rather than adapting the whitespace here, please do the
following instead, in all three OVMF DSC files: please resolve the
ResetUtilityLib class just under the "ResetSystemLib" class. (That one
belongs to [LibraryClasses] too.)

Thanks,
Laszlo

[PATCH v4 09/15] OvmfPkg/OvmfPkgX64.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 OvmfPkg/OvmfPkgX64.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index fa98f16a3fb3..895c54b0edb9 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -189,6 +189,8 @@ [LibraryClasses]
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 
   #
   # Network libraries
-- 
2.21.0.windows.1

[PATCH v4 10/15] UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add ResetUtilityLib to dsc file

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
---
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 11cf17ca0647..22bd9b8f7c60 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -205,6 +205,8 @@ [LibraryClasses]
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 [LibraryClasses.IA32.SEC]
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-- 
2.21.0.windows.1

Re: [PATCH v4 10/15] UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add ResetUtilityLib to dsc file

[Guo Dong]

Reviewed-by: Dong, Guo <guo.dong@intel.com>

Thanks,
Guo

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Sunday, August 11, 2019 8:08 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
> <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>; Gao,
> Liming <liming.gao@intel.com>
> Subject: [PATCH v4 10/15] UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add
> ResetUtilityLib to dsc file
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1772
> 
> ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
> So add it for the platform dsc file.
> 
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Benjamin You <benjamin.you@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> Reviewed-by: Maurice Ma <maurice.ma@intel.com>
> ---
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> index 11cf17ca0647..22bd9b8f7c60 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> @@ -205,6 +205,8 @@ [LibraryClasses]
> 
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tp
> mMeasurementLibNull.inf
>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> 
> +  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
> +
>  [LibraryClasses.IA32.SEC]
>    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> --
> 2.21.0.windows.1

[PATCH v4 11/15] UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc

[Gao, Zhichao]

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

ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
So add it for the platform dsc file.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
---
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index 5b7994a62cda..ec6d5b71621e 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -205,6 +205,8 @@ [LibraryClasses]
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 [LibraryClasses.IA32.SEC]
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-- 
2.21.0.windows.1

Re: [PATCH v4 11/15] UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc

[Guo Dong]

Reviewed-by: Dong, Guo <guo.dong@intel.com>

Thanks,
Guo

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Sunday, August 11, 2019 8:08 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
> <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>; Gao,
> Liming <liming.gao@intel.com>
> Subject: [PATCH v4 11/15] UefiPayloadPkg: Add ResetUtilityLib to
> UefiPayloadPkgIa32X64.dsc
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1772
> 
> ResetUtilityLib would be consumed by CapsuleRuntimeDxe.
> So add it for the platform dsc file.
> 
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Benjamin You <benjamin.you@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> Reviewed-by: Maurice Ma <maurice.ma@intel.com>
> ---
>  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> index 5b7994a62cda..ec6d5b71621e 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> @@ -205,6 +205,8 @@ [LibraryClasses]
> 
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tp
> mMeasurementLibNull.inf
>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> 
> +  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
> +
>  [LibraryClasses.IA32.SEC]
>    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> --
> 2.21.0.windows.1

[PATCH v4 12/15] MdeModulePkg/CapsuleRuntimeDxe: Transfer reset data

[Gao, Zhichao]

From: Bret Barkelew <Bret.Barkelew@microsoft.com>

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

Transfer reset data start with a null sting and followed by
gEdkiiCapsuleArmedResetGuid for capsule update.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf | 2 ++
 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c      | 2 +-
 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h      | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index 9da450722b51..fedeeac19e47 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -62,6 +62,7 @@ [LibraryClasses]
   PrintLib
   BaseMemoryLib
   CacheMaintenanceLib
+  ResetUtilityLib
 
 [LibraryClasses.X64]
   UefiLib
@@ -72,6 +73,7 @@ [Guids]
   ## SOMETIMES_PRODUCES   ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks
   gEfiCapsuleVendorGuid
   gEfiFmpCapsuleGuid                            ## SOMETIMES_CONSUMES   ## GUID # FMP capsule GUID
+  gEdkiiCapsuleArmedResetGuid                   ## SOMETIMES_CONSUMES
 
 [Protocols]
   gEfiCapsuleArchProtocolGuid                   ## PRODUCES
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 77b8f00062a6..2022b4eabd7f 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -218,7 +218,7 @@ UpdateCapsule (
        // will initiate a reset of the platform which is compatible with the passed-in capsule request and will
        // not return back to the caller.
        //
-       EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
+       ResetSystemWithSubtype (EfiResetWarm, &gEdkiiCapsuleArmedResetGuid);
      }
   }
   return Status;
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 069df3c75080..e0466f7da75a 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -4,7 +4,7 @@
   It installs the Capsule Architectural Protocol defined in PI1.0a to signify
   the capsule runtime services are ready.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -30,6 +30,7 @@
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
 #include <Library/BaseMemoryLib.h>
+#include <Library/ResetUtilityLib.h>
 
 /**
   Create the variable to save the base address of page table and stack
-- 
2.21.0.windows.1

[PATCH v4 13/15] MdeModulePkg/CapsuleLib: Transfer reset data

[Gao, Zhichao]

From: Bret Barkelew <Bret.Barkelew@microsoft.com>

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

Transfer reset data start with a null sting and followed by
gEdkiiCapsuleUpdateCompleteResetGuid for DoResetSystem
function.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf      | 2 ++
 MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
index 05de4299fba9..5fd7e1764b0b 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
@@ -51,6 +51,7 @@ [LibraryClasses]
   DisplayUpdateProgressLib
   FileHandleLib
   UefiBootManagerLib
+  ResetUtilityLib
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleMax                               ## CONSUMES
@@ -93,6 +94,7 @@ [Guids]
   ## SOMETIMES_PRODUCES ## Variable:L"BootNext"
   gEfiGlobalVariableGuid
   gEdkiiCapsuleOnDiskNameGuid             ## SOMETIMES_CONSUMES ## GUID
+  gEdkiiCapsuleUpdateCompleteResetGuid    ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiVariableWriteArchProtocolGuid
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
index 2cecc87385b3..2802962ed1b6 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
@@ -30,6 +30,7 @@
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/CapsuleLib.h>
 #include <Library/DisplayUpdateProgressLib.h>
+#include <Library/ResetUtilityLib.h>
 
 #include <IndustryStandard/WindowsUxCapsule.h>
 
@@ -623,7 +624,7 @@ DoResetSystem (
 
   REPORT_STATUS_CODE(EFI_PROGRESS_CODE, (EFI_SOFTWARE | PcdGet32(PcdStatusCodeSubClassCapsule) | PcdGet32(PcdCapsuleStatusCodeResettingSystem)));
 
-  gRT->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
+  ResetSystemWithSubtype (EfiResetCold, &gEdkiiCapsuleUpdateCompleteResetGuid);
 
   CpuDeadLoop();
 }
-- 
2.21.0.windows.1

[PATCH v4 14/15] MdePkg/UefiRuntimeLib.h: Change the comment

[Gao, Zhichao]

Change the comment of EfiResetSystem base on the
UEFI spec 2.8

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Include/Library/UefiRuntimeLib.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
index 8f13ca275d31..3962347d36bc 100644
--- a/MdePkg/Include/Library/UefiRuntimeLib.h
+++ b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -321,10 +321,10 @@ EfiGetNextHighMonotonicCount (
   @param  DataSizeThe size, in bytes, of ResetData.
   @param  ResetData   For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown the data buffer starts with a
                       Null-terminated Unicode string, optionally followed by additional binary data. The string is a
-                      description that the caller may use to further indicate the reason for the system reset. ResetData
-                      is only valid if ResetStatus is something other then EFI_SUCCESS. This pointer must be a physical
-                      address. For a ResetType of EfiResetPlatformSpecific the data buffer also starts with a Null-terminated
-                      string that is followed by an EFI_GUID that describes the specific type of reset to perform.
+                      description that the caller may use to further indicate the reason for the system reset. This
+                      pointer must be a physical address. For a ResetType of EfiResetPlatformSpecific the data buffer
+                      also starts with a Null-terminated string that is followed by an EFI_GUID that describes the
+                      specific type of reset to perform.
 **/
 VOID
 EFIAPI
-- 
2.21.0.windows.1

[PATCH v4 15/15] MdePkg/UefiRuntimeLib: Change the comment

[Gao, Zhichao]

Change the comment of EfiResetSystem base on the
UEFI spec 2.8

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Library/UefiRuntimeLib/RuntimeLib.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index 933e0099ceed..28cbf493b665 100644
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -218,10 +218,10 @@ EfiGoneVirtual (
   @param  DataSizeThe size, in bytes, of ResetData.
   @param  ResetData   For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown the data buffer starts with a
                       Null-terminated Unicode string, optionally followed by additional binary data. The string is a
-                      description that the caller may use to further indicate the reason for the system reset. ResetData
-                      is only valid if ResetStatus is something other then EFI_SUCCESS. This pointer must be a physical
-                      address. For a ResetType of EfiRestUpdate the data buffer also starts with a Null-terminated string
-                      that is followed by a physical VOID * to an EFI_CAPSULE_HEADER.
+                      description that the caller may use to further indicate the reason for the system reset. This
+                      pointer must be a physical address. For a ResetType of EfiResetPlatformSpecific the data buffer
+                      also starts with a Null-terminated string that is followed by an EFI_GUID that describes the
+                      specific type of reset to perform.
 
 **/
 VOID
-- 
2.21.0.windows.1

Re: [edk2-devel] [PATCH v4 15/15] MdePkg/UefiRuntimeLib: Change the comment

[Laszlo Ersek]

Hi,

On 08/12/19 05:07, Gao, Zhichao wrote:
> Change the comment of EfiResetSystem base on the
> UEFI spec 2.8
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  MdePkg/Library/UefiRuntimeLib/RuntimeLib.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
> index 933e0099ceed..28cbf493b665 100644
> --- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
> +++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
> @@ -218,10 +218,10 @@ EfiGoneVirtual (
>    @param  DataSizeThe size, in bytes, of ResetData.
>    @param  ResetData   For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown the data buffer starts with a
>                        Null-terminated Unicode string, optionally followed by additional binary data. The string is a
> -                      description that the caller may use to further indicate the reason for the system reset. ResetData
> -                      is only valid if ResetStatus is something other then EFI_SUCCESS. This pointer must be a physical
> -                      address. For a ResetType of EfiRestUpdate the data buffer also starts with a Null-terminated string
> -                      that is followed by a physical VOID * to an EFI_CAPSULE_HEADER.
> +                      description that the caller may use to further indicate the reason for the system reset. This
> +                      pointer must be a physical address. For a ResetType of EfiResetPlatformSpecific the data buffer
> +                      also starts with a Null-terminated string that is followed by an EFI_GUID that describes the
> +                      specific type of reset to perform.
>  
>  **/
>  VOID
> 

given that UefiRuntimeLib is a single-instance library class -- that is,
my understanding is that we never plan to introduce a different instance
for this class --, I would suggest fusing the following two patches into
one:

- [PATCH v4 14/15] MdePkg/UefiRuntimeLib.h: Change the comment
- [PATCH v4 15/15] MdePkg/UefiRuntimeLib: Change the comment

Also, can we please use a better (more specific) subject line?


Obviously I'm not an MdePkg maintainer (or even reviewer), so I defer to
Liming and Mike.

Thanks
Laszlo

Re: [edk2-devel] [PATCH v4 00/15] MdeModulePkg: Transfer reset data

[Liming Gao]

Zhichao:
  The change looks good. I have one comment to add more descriptions for new introduced two guids. 
  If so, the developer knows how to use them. 

  Besides, if this patch is for 201908 stable tag, please send RFC for this feature to announce@edk2.groups.io and devel@edk2.groups.io to collect feedbacks. 

Thanks
Liming
>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Gao, Zhichao
>Sent: Monday, August 12, 2019 11:08 AM
>To: devel@edk2.groups.io
>Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
>Ni, Ray <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Laszlo Ersek
><lersek@redhat.com>; Ard Biesheuvel <ard.biesheuvel@linaro.org>; Leif
>Lindholm <leif.lindholm@linaro.org>; Justen, Jordan L
><jordan.l.justen@intel.com>; Ma, Maurice <maurice.ma@intel.com>; Dong,
>Guo <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>; Gao,
>Liming <liming.gao@intel.com>; Kinney, Michael D
><michael.d.kinney@intel.com>; Sean Brogan <sean.brogan@microsoft.com>;
>Michael Turner <Michael.Turner@microsoft.com>; Bret Barkelew
><Bret.Barkelew@microsoft.com>; Chiu, Chasel <chasel.chiu@intel.com>
>Subject: [edk2-devel] [PATCH v4 00/15] MdeModulePkg: Transfer reset data
>
>Indicate two guids gCapsuleArmedResetGuid and
>gCapsuleUpdateCompleteResetGuid
>for capsule update. And define a struct which start with a null string and
>followed by a EFI_GUID.
>
>V2:
>Add prefix Edkii to the new guids.
>Move the new struct definition to ResetSystemLib.h.
>Fix the wrong reset data to transfer.
>Fix the comment of EfiResetSystem in RuntimeLib base on UEFI spec 2.8.
>
>V3:
>Drop 'Move the new struct definition to ResetSystemLib.h.' because the
>structure
>would be only used in ResetUtilityLib
>Using the API ResetSystemWithSubtype in ResetUtilityLib to transfer
>a single GUID reset data.
>Add ResetUtilityLib to the dsc files that contain CapsuleRuntimeDxe and
>CapsuleLib (DxeCapsuleLib instance).
>
>V4:
>Format git config to show the [] section.
>Fixed incorrect location of ResetUtilityLib in OvmfPkgIa32X64.dsc.
>
>Cc: Jian J Wang <jian.j.wang@intel.com>
>Cc: Hao Wu <hao.a.wu@intel.com>
>Cc: Ray Ni <ray.ni@intel.com>
>Cc: Star Zeng <star.zeng@intel.com>
>Cc: Laszlo Ersek <lersek@redhat.com>
>Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>Cc: Leif Lindholm <leif.lindholm@linaro.org>
>Cc: Jordan Justen <jordan.l.justen@intel.com>
>Cc: Maurice Ma <maurice.ma@intel.com>
>Cc: Guo Dong <guo.dong@intel.com>
>Cc: Benjamin You <benjamin.you@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Michael D Kinney <michael.d.kinney@intel.com>
>Cc: Sean Brogan <sean.brogan@microsoft.com>
>Cc: Michael Turner <Michael.Turner@microsoft.com>
>Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
>Cc: Chasel Chiu <chasel.chiu@intel.com>
>Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
>
>
>Bret Barkelew (3):
>  MdeModulePkg: Add guids for capsule update
>  MdeModulePkg/CapsuleRuntimeDxe: Transfer reset data
>  MdeModulePkg/CapsuleLib: Transfer reset data
>
>Zhichao Gao (12):
>  MdeModulePkg: Add ResetUtilityLib to dsc file
>  ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file
>  ArmVritPkg/ArmVirtQemuKernel.dsc: Add ResetUtilityLib to dsc file
>  ArmVirtPkg/ArmVirtXen.dsc: Add ResetUtilityLib to dsc file
>  EmulatorPkg/EmulatorPkg.dsc: Add ResetUtilityLib to dsc file
>  OvmfPkg/OvmfPkgIa32.dsc: Add ResetUtilityLib to dsc file
>  OvmfPkg/OvmfPkgIa32X64.dsc: Add ResetUtilityLib to dsc file
>  OvmfPkg/OvmfPkgX64.dsc: Add ResetUtilityLib to dsc file
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add ResetUtilityLib to dsc file
>  UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc
>  MdePkg/UefiRuntimeLib.h: Change the comment
>  MdePkg/UefiRuntimeLib: Change the comment
>
> ArmVirtPkg/ArmVirtQemu.dsc                                | 1 +
> ArmVirtPkg/ArmVirtQemuKernel.dsc                          | 1 +
> ArmVirtPkg/ArmVirtXen.dsc                                 | 1 +
> EmulatorPkg/EmulatorPkg.dsc                               | 1 +
> MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf   | 2 ++
> .../Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c       | 3 ++-
> MdeModulePkg/MdeModulePkg.dec                             | 4 ++++
> MdeModulePkg/MdeModulePkg.dsc                             | 1 +
> .../Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf     | 2 ++
> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 2 +-
> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h | 3 ++-
> MdePkg/Include/Library/UefiRuntimeLib.h                   | 8 ++++----
> MdePkg/Library/UefiRuntimeLib/RuntimeLib.c                | 8 ++++----
> OvmfPkg/OvmfPkgIa32.dsc                                   | 2 ++
> OvmfPkg/OvmfPkgIa32X64.dsc                                | 1 +
> OvmfPkg/OvmfPkgX64.dsc                                    | 2 ++
> UefiPayloadPkg/UefiPayloadPkgIa32.dsc                     | 2 ++
> UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                  | 2 ++
> 18 files changed, 35 insertions(+), 11 deletions(-)
>
>--
>2.21.0.windows.1
>
>
>