From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E29F6211B698D for ; Fri, 11 Jan 2019 01:52:21 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59D70C01CB7D; Fri, 11 Jan 2019 09:52:21 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-3.rdu2.redhat.com [10.10.120.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CF515C223; Fri, 11 Jan 2019 09:52:20 +0000 (UTC) To: Eric Dong , edk2-devel@lists.01.org Cc: Ray Ni , Aleksiy References: <20190111054639.25528-1-eric.dong@intel.com> <20190111054639.25528-2-eric.dong@intel.com> From: Laszlo Ersek Message-ID: <0459bd63-756f-c1d8-f27d-711b25d9b94e@redhat.com> Date: Fri, 11 Jan 2019 10:52:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190111054639.25528-2-eric.dong@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 11 Jan 2019 09:52:21 +0000 (UTC) Subject: Re: [Patch 1/2] UefiCpuPkg/S3Resume2Pei: Use correct field name. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2019 09:52:22 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 > Cc: Ray Ni > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > signed-off-by: Eric Dong (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 Thanks, Laszlo > Signed-off-by: Eric Dong > --- > 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.
> + Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> Copyright (c) 2017, AMD Incorporated. All rights reserved.
> > 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 > // >