-----Original Message-----
From: Li, Zhihao <zhihao.li@...>
Sent: Tuesday, March 29, 2022 2:38 PM
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@...>; Yao, Jiewen
<jiewen.yao@...>; Justen, Jordan L <jordan.l.justen@...>; Gerd
Hoffmann <kraxel@...>; Boeuf, Sebastien <sebastien.boeuf@...>
Subject: [PATCH v1 1/1] OvmfPkg: Add dependency of VariableSmm driver to
make it work normally.

REF： https://bugzilla.tianocore.org/show_bug.cgi?id=3861

UefiCpuPkg define a new Protocol with the new services
SmmWaitForAllProcessor(), which can be used by SMI handler
to optionally wait for other APs to complete SMM rendezvous in
relaxed AP mode.

VariableSmm driver need use SmmCpuRendezvousLib, So add
SmmCpuRendezvousLib in OvmfPkg.

Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Jiewen Yao <jiewen.yao@...>
Cc: Jordan Justen <jordan.l.justen@...>
Cc: Gerd Hoffmann <kraxel@...>
Cc: Sebastien Boeuf <sebastien.boeuf@...>

Signed-off-by: Zhihao Li <zhihao.li@...>
---
OvmfPkg/CloudHv/CloudHvX64.dsc | 1 +
OvmfPkg/OvmfPkgIa32.dsc | 3 ++-
OvmfPkg/OvmfPkgIa32X64.dsc | 3 ++-
OvmfPkg/OvmfPkgX64.dsc | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc
b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 8ac9227c5f50..c5f8314a37b6 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -429,6 +429,7 @@
!endif

BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+
SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuR
endezvousLib.inf



[LibraryClasses.common.SMM_CORE]

PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 29eea82571c5..e6122118e07e 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -1,7 +1,7 @@
## @file

# EFI/Framework Open Virtual Machine Firmware (OVMF) platform

#

-# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>

# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

# Copyright (c) Microsoft Corporation.

#

@@ -427,6 +427,7 @@
!endif

BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+
SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuR
endezvousLib.inf



[LibraryClasses.common.SMM_CORE]

PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 56d3c49ab21a..05c16aa3fd3e 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -1,7 +1,7 @@
## @file

# EFI/Framework Open Virtual Machine Firmware (OVMF) platform

#

-# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>

# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

# Copyright (c) Microsoft Corporation.

#

@@ -431,6 +431,7 @@
!endif

BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+
SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuR
endezvousLib.inf



[LibraryClasses.common.SMM_CORE]

PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f0924c0f9d0a..ea42bee22cb5 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -1,7 +1,7 @@
## @file

# EFI/Framework Open Virtual Machine Firmware (OVMF) platform

#

-# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>

# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

# Copyright (c) Microsoft Corporation.

#

@@ -432,6 +432,7 @@
!endif

BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+
SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuR
endezvousLib.inf



[LibraryClasses.common.SMM_CORE]

PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

--
2.26.2.windows.1