From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Jian J Wang <jian.j.wang@intel.com>,
Hao A 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>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
Zhichao gao <zhichao.gao@intel.com>
Subject: [PATCH v5 3/5] MdeMoudlePkg/CapsulePei: Optimize AreCapsulesStaged
Date: Mon, 10 Jun 2019 13:20:34 +0800 [thread overview]
Message-ID: <20190610052036.11924-4-zhichao.gao@intel.com> (raw)
In-Reply-To: <20190610052036.11924-1-zhichao.gao@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1853
AreCapsulesStaged do not need to return the status, only boolean
result is useful. So directly return a boolean value.
Cannot initialize the variable at its definition.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A 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>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Zhichao gao <zhichao.gao@intel.com>
---
.../Universal/CapsulePei/UefiCapsule.c | 42 ++++++-------------
1 file changed, 13 insertions(+), 29 deletions(-)
diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index b224e200fe..ce6d95a786 100644
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -793,29 +793,21 @@ BuildMemoryResourceDescriptor (
/**
Check if the capsules are staged.
- @param UpdateCapsules A pointer to return the check result.
-
- @retval EFI_INVALID_PARAMETER The parameter is null.
- @retval EFI_SUCCESS The Capsules are staged.
+ @retval TRUE The capsules are staged.
+ @retval FALSE The capsules are not staged.
**/
-EFI_STATUS
+BOOLEAN
AreCapsulesStaged (
- OUT BOOLEAN *UpdateCapsules
+ VOID
)
{
EFI_STATUS Status;
UINTN Size;
EFI_PEI_READ_ONLY_VARIABLE2_PPI *PPIVariableServices;
- EFI_PHYSICAL_ADDRESS CapsuleDataPtr64 = 0;
-
- if (UpdateCapsules == NULL) {
- DEBUG ((DEBUG_ERROR, "%a Invalid parameters. Inputs can't be NULL\n", __FUNCTION__));
- ASSERT (UpdateCapsules != NULL);
- return EFI_INVALID_PARAMETER;
- }
+ EFI_PHYSICAL_ADDRESS CapsuleDataPtr64;
- *UpdateCapsules = FALSE;
+ CapsuleDataPtr64 = 0;
Status = PeiServicesLocatePpi(
&gEfiPeiReadOnlyVariable2PpiGuid,
@@ -826,7 +818,7 @@ AreCapsulesStaged (
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to find ReadOnlyVariable2PPI\n"));
- return Status;
+ return FALSE;
}
//
@@ -843,10 +835,10 @@ AreCapsulesStaged (
);
if (!EFI_ERROR (Status)) {
- *UpdateCapsules = TRUE;
+ return TRUE;
}
- return EFI_SUCCESS;
+ return FALSE;
}
#define MAX_SG_LIST_HEADS (20)
@@ -1120,19 +1112,11 @@ CheckCapsuleUpdate (
IN EFI_PEI_SERVICES **PeiServices
)
{
- EFI_STATUS Status;
- BOOLEAN Update;
-
- Status = AreCapsulesStaged (&Update);
-
- if (!EFI_ERROR (Status)) {
- if (Update) {
- Status = EFI_SUCCESS;
- } else {
- Status = EFI_NOT_FOUND;
- }
+ if (AreCapsulesStaged ()) {
+ return EFI_SUCCESS;
+ } else {
+ return EFI_NOT_FOUND;
}
- return Status;
}
/**
This function will look at a capsule and determine if it's a test pattern.
--
2.21.0.windows.1
next prev parent reply other threads:[~2019-06-10 5:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 5:20 [PATCH v5 0/5] MdeModulePkg/CapsulePei: Optimize the CapsulePei Gao, Zhichao
2019-06-10 5:20 ` [PATCH v5 1/5] " Gao, Zhichao
2019-06-10 5:20 ` [PATCH v5 2/5] MdeMoudlePkg/CapsulePei: Fix coding style issue Gao, Zhichao
2019-06-10 5:20 ` Gao, Zhichao [this message]
2019-06-10 5:20 ` [PATCH v5 4/5] MdeMoudlePkg/CapsulePei: Optimize GetScatterGatherHeadEntries Gao, Zhichao
2019-06-10 5:20 ` [PATCH v5 5/5] MdeMoudlePkg/CapsulePei: No need to remain space for null-terminate Gao, Zhichao
2019-06-10 11:14 ` Leif Lindholm
2019-06-13 7:49 ` [PATCH v5 0/5] MdeModulePkg/CapsulePei: Optimize the CapsulePei Wu, Hao A
2019-06-24 1:21 ` [edk2-devel] " Wu, Hao A
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=20190610052036.11924-4-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