OvmfPkg/PlatformPei: honor extended TSEG in PcdQ35TsegMbytes if available

Recognize an extended TSEG when available in
Q35TsegMbytesInitialization(), and set both PcdQ35TsegMbytes (for
OvmfPkg/SmmAccess) and "mQ35TsegMbytes" (for PlatformPei's own use)
accordingly. The new logic interfaces with the QEMU feature added in QEMU
commit 2f295167e0c4 ("q35/mch: implement extended TSEG sizes",
2017-06-08).

At this point we have to explicitly restrict Q35TsegMbytesInitialization()
to the Q35 board, but that's OK, because Q35TsegMbytesInitialization() is
only called when PcdSmmSmramRequire is set, and for that Q35 is already an
enforced requirement.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index b8a28450d6..98cfaaa28e 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -645,6 +645,11 @@ InitializePlatform (
   AddressWidthInitialization ();

   MaxCpuCountInitialization ();

 

+  //

+  // Query Host Bridge DID

+  //

+  mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);

+

   if (FeaturePcdGet (PcdSmmSmramRequire)) {

     Q35TsegMbytesInitialization ();

   }

@@ -658,11 +663,6 @@ InitializePlatform (
     InitializeXen ();

   }

 

-  //

-  // Query Host Bridge DID

-  //

-  mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);

-

   if (mBootMode != BOOT_ON_S3_RESUME) {

     if (!FeaturePcdGet (PcdSmmSmramRequire)) {

       ReserveEmuVariableNvStore ();