On 08/18/16 03:09, Michael Kinney wrote: > Update CpuS3DataDxe and PiSmmCpuDxeSmm to consume PcdAcpiS3Enable. > If this PCD is disabled, then skip the S3 related logic in modules. > Also update PiSmmCpuDxeSmm to move S3 related code to CpuS3.c. > > Star Zeng (3): > UefiCpuPkg/CpuS3DataDxe: Consume PcdAcpiS3Enable to control the code > UefiCpuPkg/PiSmmCpuDxeSmm: Move S3 related code to CpuS3.c > UefiCpuPkg/PiSmmCpuDxeSmm: Consume PcdAcpiS3Enable to control the code > > UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c | 5 + > UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 2 + > UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 381 > +++++++++++++++++++++++++++ > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 324 +---------------------- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 70 +++-- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 1 + > 6 files changed, 442 insertions(+), 341 deletions(-) >
This series doesn't apply to current master (93e59f76fe50) any longer, which I think might be due to commit eadf70bdfbc1 which I requested. Anyway, I applied this series based off bd0656b5e2a57b0113d230c10866826d94301b5b (selected semi-randomly, just looking at the commit date vs. the posting date of this series), with git-am, cleanly, and then rebased it to current master. It built okay. I tested the series with OVMF, using 32-bit and 64-bit Fedora guests on Q35, SMM enabled. I tested both S3-enabled and S3-disabled QEMU command lines for both. Whenever S3 was enabled, I tested S3 suspend/resume too. I also compared the logs before/after the series. For all patches: Tested-by: Laszlo Ersek <[email protected]> For patches #1 and #3: Reviewed-by: Laszlo Ersek <[email protected]> For patch #2: Acked-by: Laszlo Ersek <[email protected]> (I didn't review the code movement in patch #2 in detail, only skimmed it.) Thanks Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
