[PATCH edk2-platforms v1] Platform/ARM: Map Platform Boot Timeout PCD to global NV variable

[PATCH edk2-platforms v1] Platform/ARM: Map Platform Boot Timeout PCD to global NV variable

[Alexei Fedorov]

From: Alexei Fedorov <Alexei.Fedorov@arm.com>

Table 13 of UEFI Specification 2.7A describes Timeout
global variable as NV (non-volatile), however
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
is defined in [PcdsFixedAtBuild.common] section of
edk2-platforms\Platform\ARM\VExpressPkg\ArmVExpress.dsc.inc.
This prevents Timeout value from being persistent across
resets and power cycles, see BdsEntry() code
in MdeModulePkg\Universal\BdsDxe\BdsEntry.c:
  //
  // Initialize L"Timeout" EFI global variable.
  //
  BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut);

This patch fixes the above issue by mapping PcdPlatformBootTimeOut
to global NV variable "Timeout":
[PcdsDynamicHii.common.DEFAULT]
  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10

Change-Id: I8ab8854c0789da206bf821391c67007259e48361
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
Reviewed-by:   Evan Lloyd <Evan.Lloyd@arm.com>
---
All the changes can be reviewed at:
https://github.com/AlexeiFedorov/edk2-platforms/tree/202_timeout_value_v1

Notes:
    v1:
    - Map PcdPlatformBootTimeOut to global NV Timeout variable [Alexei]

 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 7cb47937329efa1944ec4c156e2be995a755ce6f..de201b0c81d020e1e06ee320cf0f14f186723657 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2018, ARM Limited. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -353,8 +353,6 @@ [PcdsFixedAtBuild.common]
   # List of Device Paths that support BootMonFs
   gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"
 
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
-
   # RunAxf support via Dynamic Shell Command protocol
   # We want to use the Shell Libraries but don't want it to initialise
   # automatically. We initialise the libraries when the command is called by the
@@ -399,6 +397,9 @@ [PcdsFixedAtBuild.common]
   #
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE
 
+[PcdsDynamicHii.common.DEFAULT]
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
+
 [Components.common]
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
     <LibraryClasses>
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v1] Platform/ARM: Map Platform Boot Timeout PCD to global NV variable

[Ard Biesheuvel]

On 30 April 2018 at 18:29, Alexei Fedorov <alexei.fedorov@arm.com> wrote:
> From: Alexei Fedorov <Alexei.Fedorov@arm.com>
>
> Table 13 of UEFI Specification 2.7A describes Timeout
> global variable as NV (non-volatile), however
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
> is defined in [PcdsFixedAtBuild.common] section of
> edk2-platforms\Platform\ARM\VExpressPkg\ArmVExpress.dsc.inc.
> This prevents Timeout value from being persistent across
> resets and power cycles, see BdsEntry() code
> in MdeModulePkg\Universal\BdsDxe\BdsEntry.c:
>   //
>   // Initialize L"Timeout" EFI global variable.
>   //
>   BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut);
>
> This patch fixes the above issue by mapping PcdPlatformBootTimeOut
> to global NV variable "Timeout":
> [PcdsDynamicHii.common.DEFAULT]
>   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
>
> Change-Id: I8ab8854c0789da206bf821391c67007259e48361
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
> Reviewed-by:   Evan Lloyd <Evan.Lloyd@arm.com>

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

Pushed as ada17bc975be79620c126ae9a856e45c866f5701

Thanks!

> ---
> All the changes can be reviewed at:
> https://github.com/AlexeiFedorov/edk2-platforms/tree/202_timeout_value_v1
>
> Notes:
>     v1:
>     - Map PcdPlatformBootTimeOut to global NV Timeout variable [Alexei]
>
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> index 7cb47937329efa1944ec4c156e2be995a755ce6f..de201b0c81d020e1e06ee320cf0f14f186723657 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> @@ -1,5 +1,5 @@
>  #
> -#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> +#  Copyright (c) 2011-2018, ARM Limited. All rights reserved.
>  #
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the BSD License
> @@ -353,8 +353,6 @@ [PcdsFixedAtBuild.common]
>    # List of Device Paths that support BootMonFs
>    gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"
>
> -  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
> -
>    # RunAxf support via Dynamic Shell Command protocol
>    # We want to use the Shell Libraries but don't want it to initialise
>    # automatically. We initialise the libraries when the command is called by the
> @@ -399,6 +397,9 @@ [PcdsFixedAtBuild.common]
>    #
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE
>
> +[PcdsDynamicHii.common.DEFAULT]
> +  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
> +
>  [Components.common]
>    MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
>      <LibraryClasses>
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
>
>