Because CpuS3Data memory will be copy to smram at SmmReadToLock point by
PiSmmCpuDxeSmm driver, so the memory type no need to be ACPI NVS type,
also the address not limit to below 4G.
This change remove the limit of ACPI NVS memory type and below 4G.

Bugz: https://bugzilla.tianocore.org/show_bug.cgi?id=959

Cc: Marvin Häuser <Marvin.Haeuser@outlook.com>
Cc: Fan Jeff <vanjeff_919@hotmail.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Eric Dong (2):
  UefiCpuPkg/RegisterCpuFeaturesLib: Combine implementation.
  UefiCpuPkg/CpuS3DataDxe: Change Memory Type and address limitation.

 UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c                |  60 ++--------
 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf           |   1 +
 .../DxeRegisterCpuFeaturesLib.c                    |  67 -----------
 .../PeiRegisterCpuFeaturesLib.c                    | 131 ---------------------
 .../RegisterCpuFeaturesLib.c                       |  90 ++++++++++++++
 5 files changed, 104 insertions(+), 245 deletions(-)

-- 
2.15.0.windows.1