UefiCpuPkg/CpuDxe: Remove PcdCpuMaxLogicalProcessorNumber consuming

v5:
  If PcdCpuMaxLogicalProcessorNumber is set to 1 on UP system,
  MpInitLibInitialize() will be invoked. This is one bug, we need to
  call MpInitLibInitialize() always and get the BSP information.
  Just to remove PcdCpuMaxLogicalProcessorNumber() consuming from this
  driver.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Michael Kinney <michael.d.kinney@intel.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c
index efab78c83d..f3362613aa 100644
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/UefiCpuPkg/CpuDxe/CpuMp.c
@@ -613,22 +613,14 @@ InitializeMpSupport (
   UINTN          NumberOfProcessors;

   UINTN          NumberOfEnabledProcessors;

 

-  NumberOfProcessors = (UINTN) PcdGet32 (PcdCpuMaxLogicalProcessorNumber);

-  if (NumberOfProcessors < 1) {

-    DEBUG ((DEBUG_ERROR, "Setting PcdCpuMaxLogicalProcessorNumber should be more than zero.\n"));

-    return;

-  }

-

   //

-  // Only perform AP detection if PcdCpuMaxLogicalProcessorNumber is greater than 1

+  // Wakeup APs to do initialization

   //

-  if (NumberOfProcessors > 1) {

-    Status = MpInitLibInitialize ();

-    ASSERT_EFI_ERROR (Status);

+  Status = MpInitLibInitialize ();

+  ASSERT_EFI_ERROR (Status);

 

-    MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors);

-    mNumberOfProcessors = NumberOfProcessors;

-  }

+  MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors);

+  mNumberOfProcessors = NumberOfProcessors;

   DEBUG ((EFI_D_ERROR, "Detect CPU count: %d\n", mNumberOfProcessors));

 

   //