Re: [Patch 1/2] UefiCpuPkg/S3Resume2Pei: Use correct field name.

[Laszlo Ersek <lersek@redhat.com>]

On 01/11/19 06:46, Eric Dong wrote:
> ((Facs->Flags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) != 0))
> 
> In above code, Facs->OspmFlags should be used instead.
> EFI_ACPI_4_0_OSPM_64BIT_WAKE__F is a bit in OSPM Enabled Firmware
> Control Structure Flags field, not in Firmware Control Structure
> Feature Flags.
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1430

(1) Please use the following subject line for this patch:

  UefiCpuPkg/S3Resume2Pei: check 64BIT_WAKE_F in FACS.OSPMFlags

> 
> Cc: Aleksiy <oleksiyy@ami.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> signed-off-by: Eric Dong <eric.dong@intel.com>

(2) Please remove this line; it is both mis-spelled (due to the
lower-case "s"), and the next line makes it superfluous.

My comment about QEMU's rev1 FACS applies to this patch as well, i.e., I
don't expect the change to make any difference on QEMU/OVMF.

With (1) and (2) addressed:

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks,
Laszlo

> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
> index 05234a6312..c85dfc0290 100644
> --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
> +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
> @@ -4,7 +4,7 @@
>    This module will execute the boot script saved during last boot and after that,
>    control is passed to OS waking up handler.
>  
> -  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>    Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
>  
>    This program and the accompanying materials
> @@ -316,7 +316,7 @@ IsLongModeWakingVector (
>    if (Facs->XFirmwareWakingVector != 0) {
>      if ((Facs->Version == EFI_ACPI_4_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) &&
>          ((Facs->Flags & EFI_ACPI_4_0_64BIT_WAKE_SUPPORTED_F) != 0) &&
> -        ((Facs->Flags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) != 0)) {
> +        ((Facs->OspmFlags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) != 0)) {
>        // Both BIOS and OS wants 64bit vector
>        if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
>          return TRUE;
> @@ -499,7 +499,7 @@ S3ResumeBootOs (
>        ));
>      if ((Facs->Version == EFI_ACPI_4_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) &&
>          ((Facs->Flags & EFI_ACPI_4_0_64BIT_WAKE_SUPPORTED_F) != 0) &&
> -        ((Facs->Flags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) != 0)) {
> +        ((Facs->OspmFlags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) != 0)) {
>        //
>        // X64 long mode waking vector
>        //
>