Skip to content

Commit

Permalink
ArmPlatformPkg/PrePi: allow unicore version to be used on MP hardware
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ard Biesheuvel committed Apr 29, 2016
1 parent 3dece14 commit c4cc609
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
5 changes: 0 additions & 5 deletions ArmPlatformPkg/PrePi/MainUniCore.c
Expand Up @@ -21,11 +21,6 @@ PrimaryMain (
IN UINT64 StartTimeStamp
)
{
DEBUG_CODE_BEGIN();
// On MPCore system, PeiMpCore.inf should be used instead of PeiUniCore.inf
ASSERT(ArmIsMpCore() == 0);
DEBUG_CODE_END();

PrePiMain (UefiMemoryBase, StacksBase, StartTimeStamp);

// We must never return
Expand Down
2 changes: 0 additions & 2 deletions ArmPlatformPkg/PrePi/PrePi.c
Expand Up @@ -183,8 +183,6 @@ CEntryPoint (
{
UINT64 StartTimeStamp;

ASSERT(!ArmIsMpCore() || (PcdGet32 (PcdCoreCount) > 1));

// Initialize the platform specific controllers
ArmPlatformInitialize (MpId);

Expand Down

0 comments on commit c4cc609

Please sign in to comment.