ArmPlatformPkg/PrePi: allow unicore version to be used on MP hardware

When combining UEFI firmware built from Tianocore with ARM Trusted
Firmware running in EL3, it is the responsibility of ATF that only
a single core enters the UEFI firmware in EL2, and the remaining cores
are released directly to the OS via PSCI SMC calls.

In this case, we don't need the MpCore flavor of PrePi or PrePeiCore,
but the UniCore flavor currently checks the CPU identification registers
directly, and refuses to proceed if the boot CPU is part of a MpCore
system.

So drop the ASSERT()'s that implement this check.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/PrePi/MainUniCore.c b/ArmPlatformPkg/PrePi/MainUniCore.c
index 49b02338ebc2f44433649d69f177a34808040152..11b9f462bb4818e038d38a073203d3e3c1365220 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainUniCore.c
+++ b/ArmPlatformPkg/PrePi/MainUniCore.c
@@ -21,11 +21,6 @@ PrimaryMain (
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
-  DEBUG_CODE_BEGIN();\r
-    // On MPCore system, PeiMpCore.inf should be used instead of PeiUniCore.inf\r
-    ASSERT(ArmIsMpCore() == 0);\r
-  DEBUG_CODE_END();\r
-\r
   PrePiMain (UefiMemoryBase, StacksBase, StartTimeStamp);\r
 \r
   // We must never return\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 8740b2a9e84d94ec78f074a00137312ec7af2d89..36928c65a73bb644ef47a320cb39cbf10a81efcf 100644 (file)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -183,8 +183,6 @@ CEntryPoint (
 {\r
   UINT64   StartTimeStamp;\r
 \r
-  ASSERT(!ArmIsMpCore() || (PcdGet32 (PcdCoreCount) > 1));\r
-\r
   // Initialize the platform specific controllers\r
   ArmPlatformInitialize (MpId);\r
 \r