Re: [edk2-devel] [PATCH wave 1 04/10] OvmfPkg/PlatformPei: factor out Q35BoardVerification()

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 9/24/19 1:34 PM, Laszlo Ersek wrote:
> Before adding another SMM-related, and therefore Q35-only, dynamically
> detectable feature, extract the current board type check from
> Q35TsegMbytesInitialization() to a standalone function.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: Brijesh Singh <brijesh.singh@amd.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Joao M Martins <joao.m.martins@oracle.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Jun Nakajima <jun.nakajima@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Phillip Goerl <phillip.goerl@oracle.com>
> Cc: Yingwen Chen <yingwen.chen@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1512
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  OvmfPkg/PlatformPei/MemDetect.c | 13 +----------
>  OvmfPkg/PlatformPei/Platform.c  | 23 ++++++++++++++++++++
>  2 files changed, 24 insertions(+), 12 deletions(-)
> 
> diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
> index d451989f31c9..58b171fba1c8 100644
> --- a/OvmfPkg/PlatformPei/MemDetect.c
> +++ b/OvmfPkg/PlatformPei/MemDetect.c
> @@ -53,18 +53,7 @@ Q35TsegMbytesInitialization (
>    UINT16        ExtendedTsegMbytes;
>    RETURN_STATUS PcdStatus;
>  
> -  if (mHostBridgeDevId != INTEL_Q35_MCH_DEVICE_ID) {
> -    DEBUG ((
> -      DEBUG_ERROR,
> -      "%a: no TSEG (SMRAM) on host bridge DID=0x%04x; "
> -      "only DID=0x%04x (Q35) is supported\n",
> -      __FUNCTION__,
> -      mHostBridgeDevId,
> -      INTEL_Q35_MCH_DEVICE_ID
> -      ));
> -    ASSERT (FALSE);
> -    CpuDeadLoop ();
> -  }
> +  ASSERT (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID);
>  
>    //
>    // Check if QEMU offers an extended TSEG.
> diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
> index 3ba2459872d9..ca6d37cb1549 100644
> --- a/OvmfPkg/PlatformPei/Platform.c
> +++ b/OvmfPkg/PlatformPei/Platform.c
> @@ -563,6 +563,28 @@ S3Verification (
>  }
>  
>  
> +VOID
> +Q35BoardVerification (
> +  VOID
> +  )
> +{
> +  if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
> +    return;
> +  }
> +
> +  DEBUG ((
> +    DEBUG_ERROR,
> +    "%a: no TSEG (SMRAM) on host bridge DID=0x%04x; "
> +    "only DID=0x%04x (Q35) is supported\n",
> +    __FUNCTION__,
> +    mHostBridgeDevId,
> +    INTEL_Q35_MCH_DEVICE_ID
> +    ));
> +  ASSERT (FALSE);
> +  CpuDeadLoop ();
> +}
> +
> +
>  /**
>    Fetch the number of boot CPUs from QEMU and expose it to UefiCpuPkg modules.
>    Set the mMaxCpuCount variable.
> @@ -646,6 +668,7 @@ InitializePlatform (
>    mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);
>  
>    if (FeaturePcdGet (PcdSmmSmramRequire)) {
> +    Q35BoardVerification ();
>      Q35TsegMbytesInitialization ();
>    }
>  
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>