diff mbox series

[edk2,4/5] ArmPkg/PlatformBootManagerLib: call ProcessCapsules() only once

Message ID 20180607110812.26778-5-ard.biesheuvel@linaro.org
State Superseded
Headers show
Series MdeModulePkg ArmPkg: support for persistent capsules and progress reporting | expand

Commit Message

Ard Biesheuvel June 7, 2018, 11:08 a.m. UTC
ARM platforms have no restriction on when a system firmware update
capsule can be applied, and so it is not necessary to call
ProcessCapsules() twice. So let's drop the first invocation that
occurs before EndOfDxe, so that capsule updates will be applied
when the console is up and able to provide progress feedback.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 15 ---------------
 1 file changed, 15 deletions(-)

-- 
2.17.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm June 7, 2018, 3:04 p.m. UTC | #1
On Thu, Jun 07, 2018 at 01:08:11PM +0200, Ard Biesheuvel wrote:
> ARM platforms have no restriction on when a system firmware update

> capsule can be applied, and so it is not necessary to call

> ProcessCapsules() twice. So let's drop the first invocation that

> occurs before EndOfDxe, so that capsule updates will be applied

> when the console is up and able to provide progress feedback.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 15 ---------------

>  1 file changed, 15 deletions(-)

> 

> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c

> index 3456a71fbb9c..8e1ecdc01564 100644

> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c

> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c

> @@ -553,21 +553,6 @@ PlatformBootManagerBeforeConsole (

>    VOID

>    )

>  {

> -  EFI_STATUS                    Status;

> -  ESRT_MANAGEMENT_PROTOCOL      *EsrtManagement;

> -

> -  if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) {

> -    DEBUG ((DEBUG_INFO, "ProcessCapsules Before EndOfDxe ......\n"));

> -    Status = ProcessCapsules ();

> -    DEBUG ((DEBUG_INFO, "ProcessCapsules returned %r\n", Status));

> -  } else {

> -    Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL,

> -                    (VOID **)&EsrtManagement);

> -    if (!EFI_ERROR (Status)) {

> -      EsrtManagement->SyncEsrtFmp ();

> -    }

> -  }

> -

>    //

>    // Signal EndOfDxe PI Event

>    //

> -- 

> 2.17.0

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox series

Patch

diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 3456a71fbb9c..8e1ecdc01564 100644
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -553,21 +553,6 @@  PlatformBootManagerBeforeConsole (
   VOID
   )
 {
-  EFI_STATUS                    Status;
-  ESRT_MANAGEMENT_PROTOCOL      *EsrtManagement;
-
-  if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) {
-    DEBUG ((DEBUG_INFO, "ProcessCapsules Before EndOfDxe ......\n"));
-    Status = ProcessCapsules ();
-    DEBUG ((DEBUG_INFO, "ProcessCapsules returned %r\n", Status));
-  } else {
-    Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL,
-                    (VOID **)&EsrtManagement);
-    if (!EFI_ERROR (Status)) {
-      EsrtManagement->SyncEsrtFmp ();
-    }
-  }
-
   //
   // Signal EndOfDxe PI Event
   //