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

[PATCH V3 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).

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>
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                                | 2 ++
 OvmfPkg/OvmfPkgX64.dsc                                    | 2 ++
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc                     | 2 ++
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                  | 2 ++
 18 files changed, 36 insertions(+), 11 deletions(-)

-- 
2.21.0.windows.1

[PATCH V3 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 12e0bbf579..e7a71d3ab3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -402,6 +402,10 @@
   ## 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 V3 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 6ca7d9ade4..34e1910865 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -97,6 +97,7 @@
   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 V3 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 7ae6702ac1..4b8130f8e7 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -73,6 +73,7 @@
   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 V3 03/15] ArmVirtPkg/ArmVirtQemu.dsc: Add ResetUtilityLib to dsc file

[Laszlo Ersek]

On 08/08/19 03:08, 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 7ae6702ac1..4b8130f8e7 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -73,6 +73,7 @@
>    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
> 

Can you please update your git configuration for displaying the DSC
section headers near the hunk markers (@@), when a patch is formatted?
So that it's easier to see, during review, what DSC section is being
modified?

*
https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-05

$ git config diff.ini.xfuncname     '^\[[A-Za-z0-9_., ]+]'

*
https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-09

$ cat > .git/info/attributes <<EOT
*.efi     -diff
*.EFI     -diff
*.bin     -diff
*.BIN     -diff
*.raw     -diff
*.RAW     -diff
*.bmp     -diff
*.BMP     -diff
*.dec     diff=ini
*.dsc     diff=ini
*.dsc.inc diff=ini
*.fdf     diff=ini
*.fdf.inc diff=ini
*.inf     diff=ini
EOT

Can you please reformat & repost the series like that?

Thanks,
Laszlo

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

[Leif Lindholm]

On Thu, Aug 08, 2019 at 10:21:16PM +0200, Laszlo Ersek wrote:
> On 08/08/19 03:08, 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 7ae6702ac1..4b8130f8e7 100644
> > --- a/ArmVirtPkg/ArmVirtQemu.dsc
> > +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> > @@ -73,6 +73,7 @@
> >    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
> > 
> 
> Can you please update your git configuration for displaying the DSC
> section headers near the hunk markers (@@), when a patch is formatted?
> So that it's easier to see, during review, what DSC section is being
> modified?

Even better, run BaseTools/Scripts/SetupGit.py and get *all* of the
correct settings that are possible to configure statically.

/
    Leif

p.s.
Yes, I really should update the wiki to mention this.

> *
> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-05
> 
> $ git config diff.ini.xfuncname     '^\[[A-Za-z0-9_., ]+]'
> 
> *
> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-09
> 
> $ cat > .git/info/attributes <<EOT
> *.efi     -diff
> *.EFI     -diff
> *.bin     -diff
> *.BIN     -diff
> *.raw     -diff
> *.RAW     -diff
> *.bmp     -diff
> *.BMP     -diff
> *.dec     diff=ini
> *.dsc     diff=ini
> *.dsc.inc diff=ini
> *.fdf     diff=ini
> *.fdf.inc diff=ini
> *.inf     diff=ini
> EOT
> 
> Can you please reformat & repost the series like that?
> 
> Thanks,
> Laszlo

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

[Laszlo Ersek]

On 08/08/19 22:39, Leif Lindholm wrote:
> On Thu, Aug 08, 2019 at 10:21:16PM +0200, Laszlo Ersek wrote:
>> On 08/08/19 03:08, 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 7ae6702ac1..4b8130f8e7 100644
>>> --- a/ArmVirtPkg/ArmVirtQemu.dsc
>>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
>>> @@ -73,6 +73,7 @@
>>>    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
>>>
>>
>> Can you please update your git configuration for displaying the DSC
>> section headers near the hunk markers (@@), when a patch is formatted?
>> So that it's easier to see, during review, what DSC section is being
>> modified?
> 
> Even better, run BaseTools/Scripts/SetupGit.py and get *all* of the
> correct settings that are possible to configure statically.

Argh, sorry, you are right. I've completely forgotten about that script!
To my excuse, the expected usage model *is* to run it once, and then
forget about it :)

Thanks!
Laszlo

> 
> /
>     Leif
> 
> p.s.
> Yes, I really should update the wiki to mention this.
> 
>> *
>> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-05
>>
>> $ git config diff.ini.xfuncname     '^\[[A-Za-z0-9_., ]+]'
>>
>> *
>> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-09
>>
>> $ cat > .git/info/attributes <<EOT
>> *.efi     -diff
>> *.EFI     -diff
>> *.bin     -diff
>> *.BIN     -diff
>> *.raw     -diff
>> *.RAW     -diff
>> *.bmp     -diff
>> *.BMP     -diff
>> *.dec     diff=ini
>> *.dsc     diff=ini
>> *.dsc.inc diff=ini
>> *.fdf     diff=ini
>> *.fdf.inc diff=ini
>> *.inf     diff=ini
>> EOT
>>
>> Can you please reformat & repost the series like that?
>>
>> Thanks,
>> Laszlo

[PATCH V3 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 3b0f04967a..87c37a06e7 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -73,6 +73,7 @@
   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 V3 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 79304ee61d..279b246f85 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -47,6 +47,7 @@
   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 V3 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 ea8b6ce76e..4ec88569bc 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -111,6 +111,7 @@
   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 V3 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 6ab7300186..3dd9c0a3cd 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -184,6 +184,8 @@
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 
   #
   # Network libraries
-- 
2.21.0.windows.1

[PATCH V3 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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index f163aa2671..d0760769c0 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -285,6 +285,8 @@
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
 !endif
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 [LibraryClasses.common.DXE_CORE]
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
   DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-- 
2.21.0.windows.1

[PATCH V3 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 fa98f16a3f..895c54b0ed 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -189,6 +189,8 @@
 !endif
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
+  ResetUtilityLib|MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+
 
   #
   # Network libraries
-- 
2.21.0.windows.1

[PATCH V3 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>
---
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 11cf17ca06..22bd9b8f7c 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -205,6 +205,8 @@
   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 V3 10/15] UefiPayloadPkg/UefiPayloadPkgIa32.dsc: Add ResetUtilityLib to dsc file

[Ma, Maurice]

Reviewed-by: Maurice Ma <maurice.ma@intel.com>

Regards,
Maurice

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Wednesday, August 7, 2019 18:08
> 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 V3 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>
> ---
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> index 11cf17ca06..22bd9b8f7c 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> @@ -205,6 +205,8 @@
> 
> 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 V3 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>
---
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index 5b7994a62c..ec6d5b7162 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -205,6 +205,8 @@
   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 V3 11/15] UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc

[Ma, Maurice]

Reviewed-by: Maurice Ma <maurice.ma@intel.com>

Regards,
Maurice

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Wednesday, August 7, 2019 18:08
> 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 V3 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>
> ---
>  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> index 5b7994a62c..ec6d5b7162 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> @@ -205,6 +205,8 @@
> 
> 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 V3 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 9da450722b..fedeeac19e 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -62,6 +62,7 @@
   PrintLib
   BaseMemoryLib
   CacheMaintenanceLib
+  ResetUtilityLib
 
 [LibraryClasses.X64]
   UefiLib
@@ -72,6 +73,7 @@
   ## 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 77b8f00062..2022b4eabd 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 069df3c750..e0466f7da7 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 V3 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 05de4299fb..5fd7e1764b 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
@@ -51,6 +51,7 @@
   DisplayUpdateProgressLib
   FileHandleLib
   UefiBootManagerLib
+  ResetUtilityLib
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleMax                               ## CONSUMES
@@ -93,6 +94,7 @@
   ## 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 2cecc87385..2802962ed1 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 V3 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 8f13ca275d..3962347d36 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 V3 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 933e0099ce..28cbf493b6 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