The new QemuFwCfgS3Lib class has two goals:
(a) to query whether S3 support was enabled on the QEMU command line,
(b) to save fw_cfg DMA operations that are to be replayed at S3 resume
time, and more easily for the programmer than hacking Boot Script
opcodes manually.
Patches #1 through #5 introduce the new library class, with Base Null,
PEI fw_cfg, and DXE fw_cfg instances, covering goal (a) in both
ArmVirtPkg and OvmfPkg.
Patch #6 retires QemuFwCfgS3Enabled() from QemuFwCfgLib (including
library class and all instances), and switches all client modules to
QemuFwCfgS3Lib. This separates S3 concerns from QemuFwCfgLib.
Patches #7 through #10 cover goal (b) for all three library instances
(at levels of support that are appropriate for each, of course).
Patches #11 and #12 put the new library class to use in
OvmfPkg/SmmControl2Dxe and OvmfPkg/AcpiPlatformDxe, eliminating such
ACPI S3 Boot Script opcode hacking that is related to fw_cfg. (For
OvmfPkg/SmmControl2Dxe, that's "most of it", for
OvmfPkg/AcpiPlatformDxe, it's "all of it".)
I tested:
- ArmVirtQemu boot,
- OVMF boot without SMM, with S3 enabled and disabled, using a Linux
guest (and when S3 was enabled, I exercised it),
- OVMF boot with SMM, with S3 enabled and disabled, using Linux and
Windows guests,
- and whenever S3 was enabled, I exercised it
- and in the Windows guest, I tested VMGENID / WRITE_POINTER too.
The diffstat looks scary, but it's due to comments, I promise.
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=394
Repo: https://github.com/lersek/edk2.git
Branch: fw_cfg_s3
NOTE: if you want to fetch & test the branch, you'll have to revert
recent commit dc4c770763d0 ("BaseTools: add error check for Macro usage
in the INF file", 2017-02-20) on top. It causes BaseTools to mis-build
OVMF. I reported the regression on the list already, in that patch's
thread.
Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
Cc: Jordan Justen <jordan.l.jus...@intel.com>
Thanks
Laszlo
Laszlo Ersek (12):
OvmfPkg: introduce QemuFwCfgS3Lib class
OvmfPkg/QemuFwCfgS3Lib: add initial Base Null library instance
OvmfPkg/QemuFwCfgS3Lib: add initial PEI and DXE fw_cfg library
instances
ArmVirtPkg: resolve QemuFwCfgS3Lib
OvmfPkg: resolve QemuFwCfgS3Lib
ArmVirtPkg, OvmfPkg: retire QemuFwCfgS3Enabled() from QemuFwCfgLib
OvmfPkg/QemuFwCfgS3Lib: add boot script opcode generation APIs to
libclass
OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for Base Null instance
OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for PEI fw_cfg instance
OvmfPkg/QemuFwCfgS3Lib: implement opcode APIs for DXE fw_cfg instance
OvmfPkg/SmmControl2Dxe: save fw_cfg boot script with QemuFwCfgS3Lib
OvmfPkg/AcpiPlatformDxe: save fw_cfg boot script with QemuFwCfgS3Lib
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 17 -
OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h | 2 +-
OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 2 +-
OvmfPkg/AcpiPlatformDxe/BootScript.c | 262 ++-----
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 8 +
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf | 2 +-
OvmfPkg/Include/Library/QemuFwCfgLib.h | 14 -
OvmfPkg/Include/Library/QemuFwCfgS3Lib.h | 357
+++++++++
OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 1 +
OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 1 +
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h | 1 +
OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 +
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 28 -
OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf | 43 ++
OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf | 46 ++
OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf | 44 ++
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c | 109 +++
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c | 227 ++++++
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 791
++++++++++++++++++++
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c | 85 +++
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3PeiDxe.c | 48 ++
OvmfPkg/OvmfPkg.dec | 4 +
OvmfPkg/OvmfPkgIa32.dsc | 3 +
OvmfPkg/OvmfPkgIa32X64.dsc | 3 +
OvmfPkg/OvmfPkgX64.dsc | 3 +
OvmfPkg/PlatformPei/Platform.c | 1 +
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
OvmfPkg/SmmControl2Dxe/SmiFeatures.c | 224 ++----
OvmfPkg/SmmControl2Dxe/SmiFeatures.h | 5 +-
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c | 6 +-
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf | 1 +
33 files changed, 1917 insertions(+), 425 deletions(-)
create mode 100644 OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
create mode 100644 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3PeiDxe.c
--
2.9.3
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
