OvmfPkg: Override PcdCpuSmmApSyncTimeout2 to 10ms

PcdCpuSmmApSyncTimeout2 PCD was added in previous patch
(52d0a208), this patch is to override PcdCpuSmmApSyncTimeout2
to 10ms (same as PcdCpuSmmApSyncTimeout) so as to align with
original behavior.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>

6 files changed, 14 insertions, 6 deletions

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 4996885..0ad4955 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -1,7 +1,7 @@
 ## @file

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

 #

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

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

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

 #  Copyright (c) Microsoft Corporation.

 #

@@ -625,6 +625,7 @@
 !if $(SMM_REQUIRE) == TRUE

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout2|100000

 !endif

 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 998ecde..bd6e8ab 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 - 2023, Intel Corporation. All rights reserved.<BR>

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

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

 #  Copyright (c) Microsoft Corporation.

 #

@@ -651,6 +651,7 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout2|100000

 !endif

 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 603f93c..f28049a 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 - 2023, Intel Corporation. All rights reserved.<BR>

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

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

 #  Copyright (c) Microsoft Corporation.

 #  Copyright (C) 2023 - 2024, Advanced Micro Devices, Inc. All rights reserved.<BR>

@@ -663,6 +663,7 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout2|100000

 !endif

 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 1482728..f131328 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 - 2023, Intel Corporation. All rights reserved.<BR>

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

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

 #  Copyright (c) Microsoft Corporation.

 #

@@ -683,6 +683,7 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01

   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout2|100000

 !endif

 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
index 4bd24bf..b5a9590 100644
--- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
+++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
@@ -3,6 +3,7 @@
   accordingly.

 

   Copyright (C) 2016-2017, Red Hat, Inc.

+  Copyright (c) 2024, Intel Corporation. All rights reserved.

 

   SPDX-License-Identifier: BSD-2-Clause-Patent

 **/

@@ -187,6 +188,7 @@ NegotiateSmiFeatures (
     // the original QEMU behavior (i.e., unicast SMI) used to differ.

     //

     if (RETURN_ERROR (PcdSet64S (PcdCpuSmmApSyncTimeout, 1000000)) ||

+        RETURN_ERROR (PcdSet64S (PcdCpuSmmApSyncTimeout2, 1000000)) ||

         RETURN_ERROR (PcdSet8S (PcdCpuSmmSyncMode, 0x00)))

     {

       DEBUG ((

diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
index 4cad565..d20198c 100644
--- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
+++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
@@ -12,6 +12,7 @@
 # configuring it.

 #

 # Copyright (C) 2013, 2015, Red Hat, Inc.

+# Copyright (c) 2024, Intel Corporation. All rights reserved.

 #

 # SPDX-License-Identifier: BSD-2-Clause-Patent

 #

@@ -61,8 +62,9 @@
   gEfiSmmControl2ProtocolGuid   ## PRODUCES

 

 [Pcd]

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout ## SOMETIMES_PRODUCES

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode      ## SOMETIMES_PRODUCES

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout  ## SOMETIMES_PRODUCES

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout2 ## SOMETIMES_PRODUCES

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode       ## SOMETIMES_PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable

 

 [FeaturePcd]