PeiMp2UnitTest: Refine test code.

Add sample code about how to add this test driver.

Signed-off-by: Eric Dong <[email protected]>

Author: ydong10

PeiMp2UnitTest/PeiMp2UnitTest.c

@@ -9,12 +9,14 @@
 **/
 
 #include <PiPei.h>
-#include <Ppi/EdkiiMpServices2.h>
+#include <Ppi/MpServices2.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/DebugLib.h>
 #include <Library/TimerLib.h>
 #include <Library/SynchronizationLib.h>
 
+EDKII_PEI_MP_SERVICES2_PPI           *mCpuMp2Ppi;
+
 typedef struct {
   UINT32    MagicNum;
   UINT32    SleepTime;
@@ -177,13 +179,23 @@ Procedure (
   )
 {
   PEI_MP2_PROCEDURE_PARAM            *Argument;
+  UINTN                              ApIndex;
+
+  ApIndex = 0;
+
+  EFI_STATUS                         Status;
+
+  if (mCpuMp2Ppi != NULL) {
+    Status = mCpuMp2Ppi->WhoAmI (mCpuMp2Ppi, &ApIndex);
+    ASSERT_EFI_ERROR (Status);
+  }
 
   Argument = (PEI_MP2_PROCEDURE_PARAM *)ProcedureArgument;
   while (!AcquireSpinLockOrFail (&mConsoleLock)) {
     CpuPause ();
   }
 
-  DEBUG((DEBUG_INFO, "    Procedure function done, SleepTime = 0x%x.\n", Argument->SleepTime));
+  DEBUG((DEBUG_INFO, "Ap 0x%x Procedure function done, SleepTime = 0x%x.\n", ApIndex, Argument->SleepTime));
   ReleaseSpinLock (&mConsoleLock);
 
   if (Argument->SleepTime != 0) {
@@ -208,7 +220,7 @@ PeiMp2UnitTest (
   )
 {
   EFI_STATUS                           Status;
-  EDKII_PEI_MP_SERVICES2_PPI           *CpuMp2Ppi;
+
   PEI_MP2_PROCEDURE_PARAM              ProcParam;
 
   InitializeSpinLock((SPIN_LOCK*) &mConsoleLock);
@@ -220,7 +232,7 @@ PeiMp2UnitTest (
              &gEdkiiPeiMpServices2PpiGuid,
              0,
              NULL,
-             (VOID **)&CpuMp2Ppi
+             (VOID **)&mCpuMp2Ppi
              );
   ASSERT_EFI_ERROR (Status);
 
@@ -230,30 +242,36 @@ PeiMp2UnitTest (
 
   ProcParam.SleepTime = 0;
   DEBUG((DEBUG_INFO, "1.Test StartupAllCPUs begin, SleepTime = 0x%x\n", ProcParam.SleepTime));
-  Status = CpuMp2Ppi->StartupAllCPUs (
-                 CpuMp2Ppi,
+  Status = mCpuMp2Ppi->StartupAllCPUs (
+                 mCpuMp2Ppi,
                  Procedure,
                  0,
                  &ProcParam
                  );
   if (EFI_ERROR (Status)) {
-    DEBUG((DEBUG_INFO, "Test StartupAllCPUs End ==== Fail !\n"));
+    DEBUG((DEBUG_INFO, "1. Test StartupAllCPUs End ==== Fail !\n"));
   } else {
-    DEBUG((DEBUG_INFO, "Test StartupAllCPUs End ==== Pass !\n"));
+    DEBUG((DEBUG_INFO, "1. Test StartupAllCPUs End ==== Pass !\n"));
   }
 
   ProcParam.SleepTime = 0x30;
   DEBUG((DEBUG_INFO, "2.Test StartupAllCPUs with SleepTime = 0x%x\n", ProcParam.SleepTime));
-  Status = CpuMp2Ppi->StartupAllCPUs (
-                 CpuMp2Ppi,
+  Status = mCpuMp2Ppi->StartupAllCPUs (
+                 mCpuMp2Ppi,
                  Procedure,
                  0x20,
                  &ProcParam
                  );
   if (EFI_ERROR (Status)) {
-    DEBUG((DEBUG_INFO, "Test StartupAllCPUs End ==== Fail !\n"));
+    //
+    // StartAllCPUs will let APs to run the procedure first, then BSP
+    // itself will run the procedure, at last BSP will check the APs
+    // result. So the timeout value not works here because Bsp run
+    // procedure also needs time.
+    //
+    DEBUG((DEBUG_INFO, "2. Test StartupAllCPUs End ==== Fail !\n"));
   } else {
-    DEBUG((DEBUG_INFO, "Test StartupAllCPUs End ==== Pass !\n"));
+    DEBUG((DEBUG_INFO, "2. Test StartupAllCPUs End ==== Pass !\n"));
   }
 
   DEBUG((DEBUG_INFO, "Edkii Pei Mp Services2 Ppi test End!\n"));

UnitTestPkg.dsc

@@ -0,0 +1,54 @@
+## @file
+# This package provides the modules that build for a full feature platform.
+# This BoardModulePkg should only depend on EDKII Core packages and MinPlatformPkg.
+#
+# The DEC files are used by the utilities that parse DSC and
+# INF files to generate AutoGen.c and AutoGen.h files
+# for the build infrastructure.
+#
+# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  PLATFORM_NAME                  = UnitTestPkg
+  PLATFORM_GUID                  = D36FD4CC-6CD1-4CE6-AA0B-EDB469DAE48B
+  PLATFORM_VERSION               = 0.1
+  DSC_SPECIFICATION              = 0x00010005
+  OUTPUT_DIRECTORY               = Build/BoardModulePkg
+  SUPPORTED_ARCHITECTURES        = IA32|X64
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
+  SKUID_IDENTIFIER               = DEFAULT
+
+[LibraryClasses]
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+
+###################################################################################################
+#
+# Components Section - list of the modules and components that will be processed by compilation
+#                      tools and the EDK II tools to generate PE32/PE32+/Coff image files.
+#
+# Note: The EDK II DSC file is not used to specify how compiled binary images get placed
+#       into firmware volume images. This section is just a list of modules to compile from
+#       source into UEFI-compliant binaries.
+#       It is the FDF file that contains information on combining binary files into firmware
+#       volume images, whose concept is beyond UEFI and is described in PI specification.
+#       Binary modules do not need to be listed in this section, as they should be
+#       specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi),
+#       Logo (Logo.bmp), and etc.
+#       There may also be modules listed in this section that are not required in the FDF file,
+#       When a module listed here is excluded from FDF file, then UEFI-compliant binary will be
+#       generated for it, but the binary will not be put into any firmware volume.
+#
+###################################################################################################
+
+[Components]
+  UnitTestPkg/PeiMp2UnitTest/PeiMp2UnitTest.inf {
+    <LibraryClasses>
+      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+      TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+  }