From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Laszlo Ersek <lersek@redhat.com>
Cc: edk2-devel-01 <edk2-devel@ml01.01.org>,
Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [PATCH 06/12] ArmVirtPkg, OvmfPkg: retire QemuFwCfgS3Enabled() from QemuFwCfgLib
Date: Thu, 23 Feb 2017 11:18:34 +0000 [thread overview]
Message-ID: <CAKv+Gu_41EAs-h_79Zf2RrK=Fjfccp=6B8maZf5H8+qb6+BJUA@mail.gmail.com> (raw)
In-Reply-To: <20170223014814.10937-7-lersek@redhat.com>
On 23 February 2017 at 01:48, Laszlo Ersek <lersek@redhat.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=394
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> 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 <Library/IoLib.h>
> #include <Library/NvVarsFileLib.h>
> #include <Library/QemuFwCfgLib.h>
> +#include <Library/QemuFwCfgS3Lib.h>
> #include <Library/QemuBootOrderLib.h>
>
> #include <Protocol/Decompress.h>
> 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 <Library/BaseMemoryLib.h>
> #include <Library/MemoryAllocationLib.h>
> #include <Library/QemuFwCfgLib.h>
> +#include <Library/QemuFwCfgS3Lib.h>
> #include <Library/DxeServicesTableLib.h>
> #include <Library/PcdLib.h>
> #include <Library/OrderedCollectionLib.h>
> 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 <Library/BaseMemoryLib.h>
> #include <Library/DebugLib.h>
> #include <Library/QemuFwCfgLib.h>
> +#include <Library/QemuFwCfgS3Lib.h>
> #include <Protocol/LockBox.h>
> #include <LockBoxLib.h>
>
> 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 <Library/PeimEntryPoint.h>
> #include <Library/PeiServicesLib.h>
> #include <Library/QemuFwCfgLib.h>
> +#include <Library/QemuFwCfgS3Lib.h>
> #include <Library/ResourcePublicationLib.h>
> #include <Guid/MemoryTypeInformation.h>
> #include <Ppi/MasterBootMode.h>
> 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 <Library/PcdLib.h>
> #include <Library/PciLib.h>
> #include <Library/QemuFwCfgLib.h>
> +#include <Library/QemuFwCfgS3Lib.h>
> #include <Library/UefiBootServicesTableLib.h>
> #include <Protocol/S3SaveState.h>
> #include <Protocol/SmmControl2.h>
> --
> 2.9.3
>
>
next prev parent reply other threads:[~2017-02-23 11:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 1:48 [PATCH 00/12] ArmVirtPkg, OvmfPkg: factor out QemuFwCfgS3Lib Laszlo Ersek
2017-02-23 1:48 ` [PATCH 01/12] OvmfPkg: introduce QemuFwCfgS3Lib class Laszlo Ersek
2017-02-23 1:48 ` [PATCH 02/12] OvmfPkg/QemuFwCfgS3Lib: add initial Base Null library instance Laszlo Ersek
2017-02-23 1:48 ` [PATCH 03/12] OvmfPkg/QemuFwCfgS3Lib: add initial PEI and DXE fw_cfg library instances Laszlo Ersek
2017-02-23 1:48 ` [PATCH 04/12] ArmVirtPkg: resolve QemuFwCfgS3Lib Laszlo Ersek
2017-02-23 11:18 ` Ard Biesheuvel
2017-02-23 1:48 ` [PATCH 05/12] OvmfPkg: " Laszlo Ersek
2017-02-23 1:48 ` [PATCH 06/12] ArmVirtPkg, OvmfPkg: retire QemuFwCfgS3Enabled() from QemuFwCfgLib Laszlo Ersek
2017-02-23 11:18 ` Ard Biesheuvel [this message]
2017-02-23 1:48 ` [PATCH 07/12] OvmfPkg/QemuFwCfgS3Lib: add boot script opcode generation APIs to libclass Laszlo Ersek
2017-03-10 9:58 ` Jordan Justen
2017-03-10 19:14 ` Laszlo Ersek
2017-02-23 1:48 ` [PATCH 08/12] OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for Base Null instance Laszlo Ersek
2017-02-23 1:48 ` [PATCH 09/12] OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for PEI fw_cfg instance Laszlo Ersek
2017-02-23 1:48 ` [PATCH 10/12] OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for DXE " Laszlo Ersek
2017-02-23 1:48 ` [PATCH 11/12] OvmfPkg/SmmControl2Dxe: save fw_cfg boot script with QemuFwCfgS3Lib Laszlo Ersek
2017-03-10 10:14 ` Jordan Justen
2017-03-10 19:36 ` Laszlo Ersek
2017-03-13 21:32 ` Jordan Justen
2017-03-13 22:12 ` Laszlo Ersek
2017-03-13 22:43 ` Jordan Justen
2017-03-14 1:58 ` Kinney, Michael D
2017-03-14 13:48 ` Laszlo Ersek
2017-03-14 20:38 ` Laszlo Ersek
2017-02-23 1:48 ` [PATCH 12/12] OvmfPkg/AcpiPlatformDxe: " Laszlo Ersek
2017-02-23 16:59 ` [PATCH 00/12] ArmVirtPkg, OvmfPkg: factor out QemuFwCfgS3Lib Jordan Justen
2017-02-23 17:22 ` Laszlo Ersek
2017-03-06 9:19 ` Jordan Justen
2017-03-06 18:41 ` Laszlo Ersek
2017-03-10 9:55 ` Jordan Justen
2017-03-10 20:16 ` Laszlo Ersek
2017-03-11 3:17 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKv+Gu_41EAs-h_79Zf2RrK=Fjfccp=6B8maZf5H8+qb6+BJUA@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox