From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-x230.google.com (mail-it0-x230.google.com [IPv6:2607:f8b0:4001:c0b::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0E52982175 for ; Thu, 23 Feb 2017 03:18:36 -0800 (PST) Received: by mail-it0-x230.google.com with SMTP id 203so171152509ith.0 for ; Thu, 23 Feb 2017 03:18:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=o/vpbOSjkra0pHY9asVGIc6Flt/xNQkQVbX4t/bsLag=; b=h3yIoebXMJm7Lel7bEWcER66op1FcokPfKP+NeJPNQrp9V2JGlT23NxD5TOc9F5rER AhnaApFkgbg/jPejF0L75I4xX5M+kQmvy50gloEA8uPQw2q7V1pQbuDhbzpHk+ATVloy 1rHoiVQ5TMP4cJmKTH2uoJi9oi0eR+PJDc+PI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=o/vpbOSjkra0pHY9asVGIc6Flt/xNQkQVbX4t/bsLag=; b=Gsvs+sxCejGLBNDIB+HjN5mASrpjYciRMdg+vDDP2BwWLuQHOG1CfYk3LQFfyo0JTi wyxo6p4xANhUOku1Jf6VedTiaJiJNFMIKFU19JxOrmoQjIHpVlC49HuSkAzw00MxaTho 0nP6QXNglMWWfYzF9F4uPMe6MKDcbRiHMr1+X8AUQyMjX7UmrIBAvJKnEI5B4frt6zqg r5/uWBfzMvbZ0h4D/5wF8KhhKWGb0sR0FuL5ZqQnocoO8rUEbr9e4VTTPG8JI4lam63C 6tnk9PUtMHognaqI55vfUqV4hB8op64Z4ON1fvZnBjbyJsTRyEW1Ax+CFpLkv1HN7wS8 Km+g== X-Gm-Message-State: AMke39m9oJUzi6X2gQtT4alhqPisIU6CnQ/qVKfkggzGbZtgmZepzKld7ggGBqy50wv14i6pFfLLoTpzJGrrMiL4 X-Received: by 10.36.23.74 with SMTP id 71mr3256315ith.37.1487848715208; Thu, 23 Feb 2017 03:18:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.198.134 with HTTP; Thu, 23 Feb 2017 03:18:34 -0800 (PST) In-Reply-To: <20170223014814.10937-7-lersek@redhat.com> References: <20170223014814.10937-1-lersek@redhat.com> <20170223014814.10937-7-lersek@redhat.com> From: Ard Biesheuvel Date: Thu, 23 Feb 2017 11:18:34 +0000 Message-ID: To: Laszlo Ersek Cc: edk2-devel-01 , Jordan Justen Subject: Re: [PATCH 06/12] ArmVirtPkg, OvmfPkg: retire QemuFwCfgS3Enabled() from QemuFwCfgLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 11:18:36 -0000 Content-Type: text/plain; charset=UTF-8 On 23 February 2017 at 01:48, Laszlo Ersek wrote: > At this point we're ready to retire QemuFwCfgS3Enabled() from the > QemuFwCfgLib class, together with its implementations in: > > - ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > - OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > > Extend all modules that call the function with a new QemuFwCfgS3Lib class > dependency. Thanks to the previously added library class, instances, and > class resolutions, we can do this switch now as tightly as possible. > > Cc: Ard Biesheuvel > Cc: Jordan Justen > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=394 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel > --- > OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 1 + > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf | 1 + > OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 1 + > OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 + > OvmfPkg/PlatformPei/PlatformPei.inf | 1 + > OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf | 1 + > OvmfPkg/Include/Library/QemuFwCfgLib.h | 14 ---------- > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h | 1 + > ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 17 ------------ > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 1 + > OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 1 + > OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 28 -------------------- > OvmfPkg/PlatformPei/Platform.c | 1 + > OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c | 1 + > 14 files changed, 11 insertions(+), 59 deletions(-) > > diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf > index bb5f14e0fc7a..42edc97b3da2 100644 > --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf > +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf > @@ -52,6 +52,7 @@ [LibraryClasses] > UefiDriverEntryPoint > HobLib > QemuFwCfgLib > + QemuFwCfgS3Lib > MemoryAllocationLib > BaseLib > DxeServicesTableLib > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > index e550ff5a4714..a9350540215d 100644 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > @@ -44,6 +44,7 @@ [LibraryClasses] > MemoryAllocationLib > OrderedCollectionLib > QemuFwCfgLib > + QemuFwCfgS3Lib > UefiBootServicesTableLib > UefiDriverEntryPoint > > diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > index bedf1811e0b2..eb03f4f546bc 100644 > --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > @@ -40,6 +40,7 @@ [LibraryClasses] > DebugLib > UefiBootServicesTableLib > QemuFwCfgLib > + QemuFwCfgS3Lib > > [Protocols] > gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > index f9e35c955d4d..27789b7377bc 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > @@ -52,6 +52,7 @@ [LibraryClasses] > PciLib > NvVarsFileLib > QemuFwCfgLib > + QemuFwCfgS3Lib > LoadLinuxLib > QemuBootOrderLib > UefiLib > diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf > index fbaed3182dcf..53c6dd445a0e 100644 > --- a/OvmfPkg/PlatformPei/PlatformPei.inf > +++ b/OvmfPkg/PlatformPei/PlatformPei.inf > @@ -58,6 +58,7 @@ [LibraryClasses] > PeiServicesTablePointerLib > PeimEntryPoint > QemuFwCfgLib > + QemuFwCfgS3Lib > MtrrLib > PcdLib > > diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf > index 31c80bd4448c..04b1ed0e4eb3 100644 > --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf > +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf > @@ -56,6 +56,7 @@ [LibraryClasses] > PcdLib > PciLib > QemuFwCfgLib > + QemuFwCfgS3Lib > UefiBootServicesTableLib > UefiDriverEntryPoint > > diff --git a/OvmfPkg/Include/Library/QemuFwCfgLib.h b/OvmfPkg/Include/Library/QemuFwCfgLib.h > index 2a1261327b01..596e3f25d5fe 100644 > --- a/OvmfPkg/Include/Library/QemuFwCfgLib.h > +++ b/OvmfPkg/Include/Library/QemuFwCfgLib.h > @@ -179,19 +179,5 @@ QemuFwCfgFindFile ( > OUT UINTN *Size > ); > > - > -/** > - Determine if S3 support is explicitly enabled. > - > - @retval TRUE if S3 support is explicitly enabled. > - FALSE otherwise. This includes unavailability of the firmware > - configuration interface. > -**/ > -BOOLEAN > -EFIAPI > -QemuFwCfgS3Enabled ( > - VOID > - ); > - > #endif > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h > index ec58efa5ef4a..97ffbb514825 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h > @@ -48,6 +48,7 @@ Abstract: > #include > #include > #include > +#include > #include > > #include > diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > index 9dd5c911fc5c..fba1684af2b2 100644 > --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > @@ -637,20 +637,3 @@ QemuFwCfgFindFile ( > > return RETURN_NOT_FOUND; > } > - > - > -/** > - Determine if S3 support is explicitly enabled. > - > - @retval TRUE if S3 support is explicitly enabled. > - FALSE otherwise. This includes unavailability of the firmware > - configuration interface. > -**/ > -BOOLEAN > -EFIAPI > -QemuFwCfgS3Enabled ( > - VOID > - ) > -{ > - return FALSE; > -} > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > index 6a0ecd1ad962..76512534f5e0 100644 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c > index 818646a275a9..3da9cd21e5c9 100644 > --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c > +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > index 3dd55ba5042e..1bf725d8b7ae 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > @@ -368,31 +368,3 @@ QemuFwCfgFindFile ( > > return RETURN_NOT_FOUND; > } > - > - > -/** > - Determine if S3 support is explicitly enabled. > - > - @retval TRUE if S3 support is explicitly enabled. > - FALSE otherwise. This includes unavailability of the firmware > - configuration interface. > -**/ > -BOOLEAN > -EFIAPI > -QemuFwCfgS3Enabled ( > - VOID > - ) > -{ > - RETURN_STATUS Status; > - FIRMWARE_CONFIG_ITEM FwCfgItem; > - UINTN FwCfgSize; > - UINT8 SystemStates[6]; > - > - Status = QemuFwCfgFindFile ("etc/system-states", &FwCfgItem, &FwCfgSize); > - if (Status != RETURN_SUCCESS || FwCfgSize != sizeof SystemStates) { > - return FALSE; > - } > - QemuFwCfgSelectItem (FwCfgItem); > - QemuFwCfgReadBytes (sizeof SystemStates, SystemStates); > - return (BOOLEAN) (SystemStates[3] & BIT7); > -} > diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c > index 0be86722e548..77a8a16c15b8 100644 > --- a/OvmfPkg/PlatformPei/Platform.c > +++ b/OvmfPkg/PlatformPei/Platform.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c > index f31646d73461..bb79fce0855b 100644 > --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c > +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > #include > #include > #include > -- > 2.9.3 > >