[PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

Repo:   https://pagure.io/lersek/edk2.git
Branch: timeout_var

In the PlatformBootManagerLib instances, set the Timeout global variable
to the same value as PcdPlatformBootTimeOut. This way the "setvar"
command in the UEFI shell, and the "efibootmgr" command in a Linux
guest, can report the front page timeout that was requested on the QEMU
command line (see GetFrontPageTimeoutFromQemu() in
"OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").

A DEBUG_VERBOSE message is logged on success too, for our QE team's
sake.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks
Laszlo

Laszlo Ersek (2):
  OvmfPkg/PlatformBootManagerLib: sync Timeout with
    PcdPlatformBootTimeOut
  ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
    PcdPlatformBootTimeOut

 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
 OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                 | 26 +++++++++++++++++--
 OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf    |  2 ++
 4 files changed, 52 insertions(+), 4 deletions(-)

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/2] OvmfPkg/PlatformBootManagerLib: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

Set the Timeout global variable to the same value as
PcdPlatformBootTimeOut. This way the "setvar" command in the UEFI shell,
and the "efibootmgr" command in a Linux guest, can report the front page
timeout that was requested on the QEMU command line (see
GetFrontPageTimeoutFromQemu()).

A DEBUG_VERBOSE message is logged on success too, for our QE team's sake.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  2 ++
 OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c              | 26 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index f89cce187942..c479f113b92b 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -38,6 +38,7 @@ [LibraryClasses]
   BaseLib
   MemoryAllocationLib
   UefiBootServicesTableLib
+  UefiRuntimeServicesTableLib
   BaseMemoryLib
   DebugLib
   PcdLib
@@ -79,5 +80,6 @@ [Protocols]
 
 [Guids]
   gEfiEndOfDxeEventGroupGuid
+  gEfiGlobalVariableGuid
   gRootBridgesConnectedEventGroupGuid
   gUefiShellFileGuid
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 8af9b71f18a3..45d0ee9cc3a8 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -353,6 +353,7 @@ PlatformBootManagerBeforeConsole (
 {
   EFI_HANDLE    Handle;
   EFI_STATUS    Status;
+  UINT16        FrontPageTimeout;
   RETURN_STATUS PcdStatus;
 
   DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n"));
@@ -400,9 +401,30 @@ PlatformBootManagerBeforeConsole (
 
   PlatformInitializeConsole (
     XenDetected() ? gXenPlatformConsole : gPlatformConsole);
-  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut,
-                GetFrontPageTimeoutFromQemu ());
+
+  FrontPageTimeout = GetFrontPageTimeoutFromQemu ();
+  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);
   ASSERT_RETURN_ERROR (PcdStatus);
+  //
+  // Reflect the PCD in the standard Timeout variable.
+  //
+  Status = gRT->SetVariable (
+                  EFI_TIME_OUT_VARIABLE_NAME,
+                  &gEfiGlobalVariableGuid,
+                  (EFI_VARIABLE_NON_VOLATILE |
+                   EFI_VARIABLE_BOOTSERVICE_ACCESS |
+                   EFI_VARIABLE_RUNTIME_ACCESS),
+                  sizeof FrontPageTimeout,
+                  &FrontPageTimeout
+                  );
+  DEBUG ((
+    EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
+    "%a: SetVariable(%s, %u): %r\n",
+    __FUNCTION__,
+    EFI_TIME_OUT_VARIABLE_NAME,
+    FrontPageTimeout,
+    Status
+    ));
 
   PlatformRegisterOptionsAndKeys ();
 
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/2] ArmVirtPkg/PlatformBootManagerLib: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

Set the Timeout global variable to the same value as
PcdPlatformBootTimeOut. This way the "setvar" command in the UEFI shell,
and the "efibootmgr" command in a Linux guest, can report the front page
timeout that was requested on the QEMU command line (see
GetFrontPageTimeoutFromQemu()).

A DEBUG_VERBOSE message is logged on success too, for our QE team's sake.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index a9d4888d4377..6fe0a1bb122b 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -68,6 +68,7 @@ [Guids]
   gEfiFileSystemInfoGuid
   gEfiFileSystemVolumeLabelInfoIdGuid
   gEfiEndOfDxeEventGroupGuid
+  gEfiGlobalVariableGuid
   gRootBridgesConnectedEventGroupGuid
   gUefiShellFileGuid
 
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 5f6cfe64daca..69448ff65bde 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -25,6 +25,7 @@
 #include <Protocol/PciRootBridgeIo.h>
 #include <Protocol/VirtioDevice.h>
 #include <Guid/EventGroup.h>
+#include <Guid/GlobalVariable.h>
 #include <Guid/RootBridgesConnectedEventGroup.h>
 #include <Guid/SerialPortLibVendor.h>
 
@@ -686,7 +687,9 @@ PlatformBootManagerBeforeConsole (
   VOID
   )
 {
+  UINT16        FrontPageTimeout;
   RETURN_STATUS PcdStatus;
+  EFI_STATUS    Status;
 
   //
   // Signal EndOfDxe PI Event
@@ -744,9 +747,29 @@ PlatformBootManagerBeforeConsole (
   //
   // Set the front page timeout from the QEMU configuration.
   //
-  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut,
-                GetFrontPageTimeoutFromQemu ());
+  FrontPageTimeout = GetFrontPageTimeoutFromQemu ();
+  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);
   ASSERT_RETURN_ERROR (PcdStatus);
+  //
+  // Reflect the PCD in the standard Timeout variable.
+  //
+  Status = gRT->SetVariable (
+                  EFI_TIME_OUT_VARIABLE_NAME,
+                  &gEfiGlobalVariableGuid,
+                  (EFI_VARIABLE_NON_VOLATILE |
+                   EFI_VARIABLE_BOOTSERVICE_ACCESS |
+                   EFI_VARIABLE_RUNTIME_ACCESS),
+                  sizeof FrontPageTimeout,
+                  &FrontPageTimeout
+                  );
+  DEBUG ((
+    EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
+    "%a: SetVariable(%s, %u): %r\n",
+    __FUNCTION__,
+    EFI_TIME_OUT_VARIABLE_NAME,
+    FrontPageTimeout,
+    Status
+    ));
 
   //
   // Register platform-specific boot options and keyboard shortcuts.
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Ard Biesheuvel]

On Wed, 4 Mar 2020 at 10:44, Laszlo Ersek <lersek@redhat.com> wrote:
>
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: timeout_var
>
> In the PlatformBootManagerLib instances, set the Timeout global variable
> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
> command in the UEFI shell, and the "efibootmgr" command in a Linux
> guest, can report the front page timeout that was requested on the QEMU
> command line (see GetFrontPageTimeoutFromQemu() in
> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
>
> A DEBUG_VERBOSE message is logged on success too, for our QE team's
> sake.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Thanks
> Laszlo
>
> Laszlo Ersek (2):
>   OvmfPkg/PlatformBootManagerLib: sync Timeout with
>     PcdPlatformBootTimeOut
>   ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
>     PcdPlatformBootTimeOut
>

Provided that the use of the bare 'sizeof <identifier>' doesn't throw
up any build errors with Clang (I seem to remember a report from Mike
Kinney about this?)

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

>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
>  OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                 | 26 +++++++++++++++++--
>  OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf    |  2 ++
>  4 files changed, 52 insertions(+), 4 deletions(-)
>
> --
> 2.19.1.3.g30247aa5d201
>

Re: [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

On 03/04/20 10:54, Ard Biesheuvel wrote:
> On Wed, 4 Mar 2020 at 10:44, Laszlo Ersek <lersek@redhat.com> wrote:
>>
>> Repo:   https://pagure.io/lersek/edk2.git
>> Branch: timeout_var
>>
>> In the PlatformBootManagerLib instances, set the Timeout global variable
>> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
>> command in the UEFI shell, and the "efibootmgr" command in a Linux
>> guest, can report the front page timeout that was requested on the QEMU
>> command line (see GetFrontPageTimeoutFromQemu() in
>> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
>>
>> A DEBUG_VERBOSE message is logged on success too, for our QE team's
>> sake.
>>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>> Cc: Leif Lindholm <leif@nuviainc.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Thanks
>> Laszlo
>>
>> Laszlo Ersek (2):
>>   OvmfPkg/PlatformBootManagerLib: sync Timeout with
>>     PcdPlatformBootTimeOut
>>   ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
>>     PcdPlatformBootTimeOut
>>
> 
> Provided that the use of the bare 'sizeof <identifier>' doesn't throw
> up any build errors with Clang (I seem to remember a report from Mike
> Kinney about this?)
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

I use the "sizeof" operator exclusively without parens if the operand is
not a type name, at least in packages that I co-maintain. I don't recall
any particular build failures (even from the edk2 CI).

Thanks!
Laszlo

> 
>>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
>>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
>>  OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                 | 26 +++++++++++++++++--
>>  OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf    |  2 ++
>>  4 files changed, 52 insertions(+), 4 deletions(-)
>>
>> --
>> 2.19.1.3.g30247aa5d201
>>
> 

Re: [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Ard Biesheuvel]

On Wed, 4 Mar 2020 at 15:51, Laszlo Ersek <lersek@redhat.com> wrote:
>
> On 03/04/20 10:54, Ard Biesheuvel wrote:
> > On Wed, 4 Mar 2020 at 10:44, Laszlo Ersek <lersek@redhat.com> wrote:
> >>
> >> Repo:   https://pagure.io/lersek/edk2.git
> >> Branch: timeout_var
> >>
> >> In the PlatformBootManagerLib instances, set the Timeout global variable
> >> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
> >> command in the UEFI shell, and the "efibootmgr" command in a Linux
> >> guest, can report the front page timeout that was requested on the QEMU
> >> command line (see GetFrontPageTimeoutFromQemu() in
> >> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
> >>
> >> A DEBUG_VERBOSE message is logged on success too, for our QE team's
> >> sake.
> >>
> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> Cc: Jordan Justen <jordan.l.justen@intel.com>
> >> Cc: Leif Lindholm <leif@nuviainc.com>
> >> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>
> >> Thanks
> >> Laszlo
> >>
> >> Laszlo Ersek (2):
> >>   OvmfPkg/PlatformBootManagerLib: sync Timeout with
> >>     PcdPlatformBootTimeOut
> >>   ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
> >>     PcdPlatformBootTimeOut
> >>
> >
> > Provided that the use of the bare 'sizeof <identifier>' doesn't throw
> > up any build errors with Clang (I seem to remember a report from Mike
> > Kinney about this?)
> >
> > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> I use the "sizeof" operator exclusively without parens if the operand is
> not a type name, at least in packages that I co-maintain. I don't recall
> any particular build failures (even from the edk2 CI).
>

OK fine. I don't remember the exact details, and I kind of like this
notation as well, so ... :-)

Re: [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Philippe Mathieu-Daudé]

On 3/4/20 10:44 AM, Laszlo Ersek wrote:
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: timeout_var
> 
> In the PlatformBootManagerLib instances, set the Timeout global variable
> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
> command in the UEFI shell, and the "efibootmgr" command in a Linux
> guest, can report the front page timeout that was requested on the QEMU
> command line (see GetFrontPageTimeoutFromQemu() in
> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
> 
> A DEBUG_VERBOSE message is logged on success too, for our QE team's
> sake.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (2):
>    OvmfPkg/PlatformBootManagerLib: sync Timeout with
>      PcdPlatformBootTimeOut
>    ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
>      PcdPlatformBootTimeOut
> 
>   ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
>   ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
>   OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                 | 26 +++++++++++++++++--
>   OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf    |  2 ++
>   4 files changed, 52 insertions(+), 4 deletions(-)
> 

Series:
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

On 03/04/20 16:50, Philippe Mathieu-Daudé wrote:
> On 3/4/20 10:44 AM, Laszlo Ersek wrote:
>> Repo:   https://pagure.io/lersek/edk2.git
>> Branch: timeout_var
>>
>> In the PlatformBootManagerLib instances, set the Timeout global variable
>> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
>> command in the UEFI shell, and the "efibootmgr" command in a Linux
>> guest, can report the front page timeout that was requested on the QEMU
>> command line (see GetFrontPageTimeoutFromQemu() in
>> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
>>
>> A DEBUG_VERBOSE message is logged on success too, for our QE team's
>> sake.
>>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>> Cc: Leif Lindholm <leif@nuviainc.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Thanks
>> Laszlo
>>
>> Laszlo Ersek (2):
>>    OvmfPkg/PlatformBootManagerLib: sync Timeout with
>>      PcdPlatformBootTimeOut
>>    ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
>>      PcdPlatformBootTimeOut
>>
>>   ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c              
>> | 27 ++++++++++++++++++--
>>   ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
>> |  1 +
>>   OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                
>> | 26 +++++++++++++++++--
>>   OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf   
>> |  2 ++
>>   4 files changed, 52 insertions(+), 4 deletions(-)
>>
> 
> Series:
> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
> 

Thank you!

I plan to push this tomorrow, with your R-b, and Ard's.

Thanks
Laszlo

Re: [edk2-devel] [PATCH 0/2] OvmfPkg, ArmVirtPkg: sync Timeout with PcdPlatformBootTimeOut

[Laszlo Ersek]

On 03/04/20 10:44, Laszlo Ersek wrote:
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: timeout_var
> 
> In the PlatformBootManagerLib instances, set the Timeout global variable
> to the same value as PcdPlatformBootTimeOut. This way the "setvar"
> command in the UEFI shell, and the "efibootmgr" command in a Linux
> guest, can report the front page timeout that was requested on the QEMU
> command line (see GetFrontPageTimeoutFromQemu() in
> "OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c").
> 
> A DEBUG_VERBOSE message is logged on success too, for our QE team's
> sake.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (2):
>   OvmfPkg/PlatformBootManagerLib: sync Timeout with
>     PcdPlatformBootTimeOut
>   ArmVirtPkg/PlatformBootManagerLib: sync Timeout with
>     PcdPlatformBootTimeOut
> 
>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c               | 27 ++++++++++++++++++--
>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |  1 +
>  OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c                 | 26 +++++++++++++++++--
>  OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf    |  2 ++
>  4 files changed, 52 insertions(+), 4 deletions(-)
> 

Merged as commit range 3b9cd714542a..7288ff4095cf, via
<https://github.com/tianocore/edk2/pull/422>.

Thanks!
Laszlo