UefiCpuPkg: CpuDxe: Use PCD for AP detection timeout

Use PcdCpuApInitTimeOutInMicroSeconds instead of hardcoded 100ms for
the time to wait for all APs to respond to first INIT SIPI SIPI
wake request.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18630 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UefiCpuPkg/CpuDxe/ApStartup.c b/UefiCpuPkg/CpuDxe/ApStartup.c
index 38a9c0e6ea277639cc40e88b833a9602bdf5cb26..78fb26f9856abc9a468de88d9da1f28b81c7c6a4 100644 (file)
--- a/UefiCpuPkg/CpuDxe/ApStartup.c
+++ b/UefiCpuPkg/CpuDxe/ApStartup.c
@@ -452,9 +452,9 @@ StartApsStackless (
 {\r
   SendInitSipiSipiAllExcludingSelf ((UINT32)(UINTN)(VOID*) StartupCode);\r
   //\r
 {\r
   SendInitSipiSipiAllExcludingSelf ((UINT32)(UINTN)(VOID*) StartupCode);\r
   //\r

-  // Wait 100 milliseconds for APs to arrive at the ApEntryPoint routine\r
+  // Wait for APs to arrive at the ApEntryPoint routine\r

   //\r
   //\r

-  MicroSecondDelay (100 * 1000);\r
+  MicroSecondDelay (PcdGet32 (PcdCpuApInitTimeOutInMicroSeconds));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index a2519222268c67ce8b8ce879fd67add611323eab..9db5303ae94af6a2f712b1f7dbbf000c2db00d68 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -84,8 +84,9 @@
   gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB\r
 \r
 [Pcd]\r
   gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB\r
 \r
 [Pcd]\r

-  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber   ## CONSUMES\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                 ## CONSUMES\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber    ## CONSUMES\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                  ## CONSUMES\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds  ## CONSUMES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r