public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Jian J Wang <jian.j.wang@intel.com>, Hao Wu <hao.a.wu@intel.com>,
	Ray Ni <ray.ni@intel.com>, Star Zeng <star.zeng@intel.com>,
	Liming Gao <liming.gao@intel.com>,
	Sean Brogan <sean.brogan@microsoft.com>,
	Michael Turner <Michael.Turner@microsoft.com>
Subject: [PATCH V3 12/15] MdeModulePkg/CapsuleRuntimeDxe: Transfer reset data
Date: Thu,  8 Aug 2019 09:08:22 +0800	[thread overview]
Message-ID: <20190808010825.16784-13-zhichao.gao@intel.com> (raw)
In-Reply-To: <20190808010825.16784-1-zhichao.gao@intel.com>

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


  parent reply	other threads:[~2019-08-08  1:08 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-08  1:08 [PATCH V3 00/15] MdeModulePkg: Transfer reset data Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 01/15] MdeModulePkg: Add guids for capsule update Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 02/15] MdeModulePkg: Add ResetUtilityLib to dsc file Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 03/15] ArmVirtPkg/ArmVirtQemu.dsc: " Gao, Zhichao
2019-08-08 20:21   ` Laszlo Ersek
2019-08-08 20:39     ` Leif Lindholm
2019-08-08 22:24       ` Laszlo Ersek
2019-08-08  1:08 ` [PATCH V3 04/15] ArmVritPkg/ArmVirtQemuKernel.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 05/15] ArmVirtPkg/ArmVirtXen.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 06/15] EmulatorPkg/EmulatorPkg.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 07/15] OvmfPkg/OvmfPkgIa32.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 08/15] OvmfPkg/OvmfPkgIa32X64.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 09/15] OvmfPkg/OvmfPkgX64.dsc: " Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 10/15] UefiPayloadPkg/UefiPayloadPkgIa32.dsc: " Gao, Zhichao
2019-08-08  1:38   ` Ma, Maurice
2019-08-08  1:08 ` [PATCH V3 11/15] UefiPayloadPkg: Add ResetUtilityLib to UefiPayloadPkgIa32X64.dsc Gao, Zhichao
2019-08-08  1:37   ` Ma, Maurice
2019-08-08  1:08 ` Gao, Zhichao [this message]
2019-08-08  1:08 ` [PATCH V3 13/15] MdeModulePkg/CapsuleLib: Transfer reset data Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 14/15] MdePkg/UefiRuntimeLib.h: Change the comment Gao, Zhichao
2019-08-08  1:08 ` [PATCH V3 15/15] MdePkg/UefiRuntimeLib: " Gao, Zhichao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190808010825.16784-13-zhichao.gao@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox