Remove the ClusterId and CoreId fields in the ARM_CORE_INFO structure in favor of a new Mpidr field. Update code in ArmPlatformPkg/PrePeiCore/MainMPCore and ArmPlatformPkg/PrePi/MainMPCore.c to use the new field and call new macros GET_MPIDR_AFF0 and GET_MPIDR_AFF1 instead. Signed-off-by: Rebecca Cran <rebecca@nuviainc.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
		
			
				
	
	
		
			105 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			105 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /** @file
 | |
| 
 | |
|   Copyright (c) 2011-2014, ARM Limited. All rights reserved.
 | |
| 
 | |
|   SPDX-License-Identifier: BSD-2-Clause-Patent
 | |
| 
 | |
| **/
 | |
| 
 | |
| #include "PrePi.h"
 | |
| 
 | |
| #include <Library/ArmGicLib.h>
 | |
| 
 | |
| #include <Ppi/ArmMpCoreInfo.h>
 | |
| 
 | |
| VOID
 | |
| PrimaryMain (
 | |
|   IN  UINTN   UefiMemoryBase,
 | |
|   IN  UINTN   StacksBase,
 | |
|   IN  UINT64  StartTimeStamp
 | |
|   )
 | |
| {
 | |
|   // Enable the GIC Distributor
 | |
|   ArmGicEnableDistributor (PcdGet64 (PcdGicDistributorBase));
 | |
| 
 | |
|   // In some cases, the secondary cores are waiting for an SGI from the next stage boot loader to resume their initialization
 | |
|   if (!FixedPcdGet32 (PcdSendSgiToBringUpSecondaryCores)) {
 | |
|     // Sending SGI to all the Secondary CPU interfaces
 | |
|     ArmGicSendSgiTo (PcdGet64 (PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E, PcdGet32 (PcdGicSgiIntId));
 | |
|   }
 | |
| 
 | |
|   PrePiMain (UefiMemoryBase, StacksBase, StartTimeStamp);
 | |
| 
 | |
|   // We must never return
 | |
|   ASSERT (FALSE);
 | |
| }
 | |
| 
 | |
| VOID
 | |
| SecondaryMain (
 | |
|   IN  UINTN  MpId
 | |
|   )
 | |
| {
 | |
|   EFI_STATUS            Status;
 | |
|   ARM_MP_CORE_INFO_PPI  *ArmMpCoreInfoPpi;
 | |
|   UINTN                 Index;
 | |
|   UINTN                 ArmCoreCount;
 | |
|   ARM_CORE_INFO         *ArmCoreInfoTable;
 | |
|   UINT32                ClusterId;
 | |
|   UINT32                CoreId;
 | |
| 
 | |
|   VOID  (*SecondaryStart)(
 | |
|     VOID
 | |
|     );
 | |
|   UINTN  SecondaryEntryAddr;
 | |
|   UINTN  AcknowledgeInterrupt;
 | |
|   UINTN  InterruptId;
 | |
| 
 | |
|   ClusterId = GET_CLUSTER_ID (MpId);
 | |
|   CoreId    = GET_CORE_ID (MpId);
 | |
| 
 | |
|   // On MP Core Platform we must implement the ARM MP Core Info PPI (gArmMpCoreInfoPpiGuid)
 | |
|   Status = GetPlatformPpi (&gArmMpCoreInfoPpiGuid, (VOID **)&ArmMpCoreInfoPpi);
 | |
|   ASSERT_EFI_ERROR (Status);
 | |
| 
 | |
|   ArmCoreCount = 0;
 | |
|   Status       = ArmMpCoreInfoPpi->GetMpCoreInfo (&ArmCoreCount, &ArmCoreInfoTable);
 | |
|   ASSERT_EFI_ERROR (Status);
 | |
| 
 | |
|   // Find the core in the ArmCoreTable
 | |
|   for (Index = 0; Index < ArmCoreCount; Index++) {
 | |
|     if ((GET_MPIDR_AFF1 (ArmCoreInfoTable[Index].Mpidr) == ClusterId) &&
 | |
|         (GET_MPIDR_AFF0 (ArmCoreInfoTable[Index].Mpidr) == CoreId))
 | |
|     {
 | |
|       break;
 | |
|     }
 | |
|   }
 | |
| 
 | |
|   // The ARM Core Info Table must define every core
 | |
|   ASSERT (Index != ArmCoreCount);
 | |
| 
 | |
|   // Clear Secondary cores MailBox
 | |
|   MmioWrite32 (ArmCoreInfoTable[Index].MailboxClearAddress, ArmCoreInfoTable[Index].MailboxClearValue);
 | |
| 
 | |
|   do {
 | |
|     ArmCallWFI ();
 | |
| 
 | |
|     // Read the Mailbox
 | |
|     SecondaryEntryAddr = MmioRead32 (ArmCoreInfoTable[Index].MailboxGetAddress);
 | |
| 
 | |
|     // Acknowledge the interrupt and send End of Interrupt signal.
 | |
|     AcknowledgeInterrupt = ArmGicAcknowledgeInterrupt (PcdGet64 (PcdGicInterruptInterfaceBase), &InterruptId);
 | |
|     // Check if it is a valid interrupt ID
 | |
|     if (InterruptId < ArmGicGetMaxNumInterrupts (PcdGet64 (PcdGicDistributorBase))) {
 | |
|       // Got a valid SGI number hence signal End of Interrupt
 | |
|       ArmGicEndOfInterrupt (PcdGet64 (PcdGicInterruptInterfaceBase), AcknowledgeInterrupt);
 | |
|     }
 | |
|   } while (SecondaryEntryAddr == 0);
 | |
| 
 | |
|   // Jump to secondary core entry point.
 | |
|   SecondaryStart = (VOID (*)()) SecondaryEntryAddr;
 | |
|   SecondaryStart ();
 | |
| 
 | |
|   // The secondaries shouldn't reach here
 | |
|   ASSERT (FALSE);
 | |
| }
 |