diff options
Diffstat (limited to 'StandaloneMmPkg')
5 files changed, 51 insertions, 315 deletions
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c index f660d1210a..b6cecd1336 100644 --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c @@ -1,7 +1,7 @@ /** @file
Copyright (c) 2016 HP Development Company, L.P.
- Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
+ Copyright (c) 2016 - 2024, Arm Limited. All rights reserved.
Copyright (c) 2021, Linaro Limited
Copyright (c) 2023, Ventana Micro System Inc. All rights reserved.
@@ -36,14 +36,10 @@ MmFoundationEntryRegister ( // event. It will either be populated in a EFI_MM_COMMUNICATE_HEADER by the
// caller of the event (e.g. MM_COMMUNICATE SMC) or by the CPU driver
// (e.g. during an asynchronous event). In either case, this context is
-// maintained in an array which has an entry for each CPU. The pointer to this
-// array is held in PerCpuGuidedEventContext. Memory is allocated once the
-// number of CPUs in the system are made known through the
-// MP_INFORMATION_HOB_DATA.
+// maintained in single global variable because StandaloneMm is UP-migratable
+// (which means it cannot run concurrently)
//
-EFI_MM_COMMUNICATE_HEADER **PerCpuGuidedEventContext = NULL;
-
-MP_INFORMATION_HOB_DATA *mMpInformationHobData;
+EFI_MM_COMMUNICATE_HEADER *gGuidedEventContext = NULL;
EFI_MM_CONFIGURATION_PROTOCOL mMmConfig = {
0,
@@ -60,8 +56,7 @@ STATIC EFI_MM_ENTRY_POINT mMmEntryPoint = NULL; The PI Standalone MM entry point for the CPU driver.
@param [in] EventId The event Id.
- @param [in] CpuNumber The CPU number.
- @param [in] NsCommBufferAddr Address of the NS common buffer.
+ @param [in] CommBufferAddr Address of the communication buffer.
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER A parameter was invalid.
@@ -72,77 +67,68 @@ STATIC EFI_MM_ENTRY_POINT mMmEntryPoint = NULL; EFI_STATUS
PiMmStandaloneMmCpuDriverEntry (
IN UINTN EventId,
- IN UINTN CpuNumber,
- IN UINTN NsCommBufferAddr
+ IN UINTN CommBufferAddr
)
{
- EFI_MM_COMMUNICATE_HEADER *GuidedEventContext;
- EFI_MM_ENTRY_CONTEXT MmEntryPointContext;
- EFI_STATUS Status;
- UINTN NsCommBufferSize;
+ EFI_MM_ENTRY_CONTEXT MmEntryPointContext;
+ EFI_STATUS Status;
+ UINTN CommBufferSize;
- DEBUG ((DEBUG_INFO, "Received event - 0x%x on cpu %d\n", EventId, CpuNumber));
+ DEBUG ((DEBUG_INFO, "Received event - 0x%x\n", EventId));
Status = EFI_SUCCESS;
// Perform parameter validation of NsCommBufferAddr
- if (NsCommBufferAddr == (UINTN)NULL) {
+ if (CommBufferAddr == (UINTN)NULL) {
return EFI_INVALID_PARAMETER;
}
+ if (mMmEntryPoint == NULL) {
+ DEBUG ((DEBUG_ERROR, "Mm Entry point Not Found\n"));
+ return EFI_UNSUPPORTED;
+ }
+
// Find out the size of the buffer passed
- NsCommBufferSize = ((EFI_MM_COMMUNICATE_HEADER *)NsCommBufferAddr)->MessageLength +
- sizeof (EFI_MM_COMMUNICATE_HEADER);
+ CommBufferSize = ((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->MessageLength +
+ sizeof (EFI_MM_COMMUNICATE_HEADER);
- GuidedEventContext = NULL;
// Now that the secure world can see the normal world buffer, allocate
// memory to copy the communication buffer to the secure world.
Status = mMmst->MmAllocatePool (
EfiRuntimeServicesData,
- NsCommBufferSize,
- (VOID **)&GuidedEventContext
+ CommBufferSize,
+ (VOID **)&gGuidedEventContext
);
- if (Status != EFI_SUCCESS) {
+ if (EFI_ERROR (Status)) {
+ gGuidedEventContext = NULL;
DEBUG ((DEBUG_ERROR, "Mem alloc failed - 0x%x\n", EventId));
- return EFI_OUT_OF_RESOURCES;
+ return Status;
}
- // X1 contains the VA of the normal world memory accessible from
- // secure world.
- CopyMem (GuidedEventContext, (CONST VOID *)NsCommBufferAddr, NsCommBufferSize);
-
- // Stash the pointer to the allocated Event Context for this CPU
- PerCpuGuidedEventContext[CpuNumber] = GuidedEventContext;
+ CopyMem (gGuidedEventContext, (CONST VOID *)CommBufferAddr, CommBufferSize);
ZeroMem (&MmEntryPointContext, sizeof (EFI_MM_ENTRY_CONTEXT));
- MmEntryPointContext.CurrentlyExecutingCpu = CpuNumber;
- MmEntryPointContext.NumberOfCpus = mMpInformationHobData->NumberOfProcessors;
+ // StandaloneMm UP-migratable which means it cannot run concurrently.
+ // Therefore, set number of cpus as 1 and cpu number as 0.
+ MmEntryPointContext.CurrentlyExecutingCpu = 0;
+ MmEntryPointContext.NumberOfCpus = 1;
// Populate the MM system table with MP and state information
- mMmst->CurrentlyExecutingCpu = CpuNumber;
- mMmst->NumberOfCpus = mMpInformationHobData->NumberOfProcessors;
+ mMmst->CurrentlyExecutingCpu = 0;
+ mMmst->NumberOfCpus = 1;
mMmst->CpuSaveStateSize = 0;
mMmst->CpuSaveState = NULL;
- if (mMmEntryPoint == NULL) {
- DEBUG ((DEBUG_ERROR, "Mm Entry point Not Found\n"));
- return EFI_UNSUPPORTED;
- }
-
mMmEntryPoint (&MmEntryPointContext);
// Free the memory allocation done earlier and reset the per-cpu context
- ASSERT (GuidedEventContext);
- CopyMem ((VOID *)NsCommBufferAddr, (CONST VOID *)GuidedEventContext, NsCommBufferSize);
-
- Status = mMmst->MmFreePool ((VOID *)GuidedEventContext);
- if (Status != EFI_SUCCESS) {
- return EFI_OUT_OF_RESOURCES;
- }
+ CopyMem ((VOID *)CommBufferAddr, (CONST VOID *)gGuidedEventContext, CommBufferSize);
- PerCpuGuidedEventContext[CpuNumber] = NULL;
+ Status = mMmst->MmFreePool ((VOID *)gGuidedEventContext);
+ ASSERT_EFI_ERROR (Status);
+ gGuidedEventContext = NULL;
return Status;
}
@@ -193,29 +179,27 @@ PiMmCpuTpFwRootMmiHandler ( )
{
EFI_STATUS Status;
- UINTN CpuNumber;
ASSERT (Context == NULL);
ASSERT (CommBuffer == NULL);
ASSERT (CommBufferSize == NULL);
- CpuNumber = mMmst->CurrentlyExecutingCpu;
- if (PerCpuGuidedEventContext[CpuNumber] == NULL) {
+ if (gGuidedEventContext == NULL) {
return EFI_NOT_FOUND;
}
DEBUG ((
DEBUG_INFO,
"CommBuffer - 0x%x, CommBufferSize - 0x%x\n",
- PerCpuGuidedEventContext[CpuNumber],
- PerCpuGuidedEventContext[CpuNumber]->MessageLength
+ gGuidedEventContext,
+ gGuidedEventContext->MessageLength
));
Status = mMmst->MmiManage (
- &PerCpuGuidedEventContext[CpuNumber]->HeaderGuid,
+ &gGuidedEventContext->HeaderGuid,
NULL,
- PerCpuGuidedEventContext[CpuNumber]->Data,
- &PerCpuGuidedEventContext[CpuNumber]->MessageLength
+ gGuidedEventContext->Data,
+ &gGuidedEventContext->MessageLength
);
if (Status != EFI_SUCCESS) {
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c index b6d8d37b97..f2b566b108 100644 --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c @@ -22,10 +22,6 @@ #include <StandaloneMmCpu.h>
-// GUID to identify HOB with whereabouts of communication buffer with Normal
-// World
-extern EFI_GUID gEfiStandaloneMmNonSecureBufferGuid;
-
//
// mPiMmCpuDriverEpProtocol for Cpu driver entry point to handle
// mm communication event.
@@ -42,42 +38,6 @@ EFI_MM_SYSTEM_TABLE *mMmst = NULL; //
STATIC EFI_HANDLE mMmCpuHandle = NULL;
-/** Returns the HOB data for the matching HOB GUID.
-
- @param [in] HobList Pointer to the HOB list.
- @param [in] HobGuid The GUID for the HOB.
- @param [out] HobData Pointer to the HOB data.
-
- @retval EFI_SUCCESS The function completed successfully.
- @retval EFI_INVALID_PARAMETER Invalid parameter.
- @retval EFI_NOT_FOUND Could not find HOB with matching GUID.
-**/
-EFI_STATUS
-GetGuidedHobData (
- IN VOID *HobList,
- IN CONST EFI_GUID *HobGuid,
- OUT VOID **HobData
- )
-{
- EFI_HOB_GUID_TYPE *Hob;
-
- if ((HobList == NULL) || (HobGuid == NULL) || (HobData == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- Hob = GetNextGuidHob (HobGuid, HobList);
- if (Hob == NULL) {
- return EFI_NOT_FOUND;
- }
-
- *HobData = GET_GUID_HOB_DATA (Hob);
- if (*HobData == NULL) {
- return EFI_NOT_FOUND;
- }
-
- return EFI_SUCCESS;
-}
-
/** Entry point for the Standalone MM CPU driver.
@param [in] ImageHandle Unused. Not actual image handle.
@@ -95,14 +55,8 @@ StandaloneMmCpuInitialize ( IN EFI_MM_SYSTEM_TABLE *SystemTable // not actual systemtable
)
{
- EFI_CONFIGURATION_TABLE *ConfigurationTable;
- MP_INFORMATION_HOB_DATA *MpInformationHobData;
- EFI_STATUS Status;
- EFI_HANDLE DispatchHandle;
- UINT32 MpInfoSize;
- UINTN Index;
- UINTN ArraySize;
- VOID *HobStart;
+ EFI_STATUS Status;
+ EFI_HANDLE DispatchHandle;
ASSERT (SystemTable != NULL);
mMmst = SystemTable;
@@ -141,89 +95,5 @@ StandaloneMmCpuInitialize ( return Status;
}
- // Retrieve the Hoblist from the MMST to extract the details of the NS
- // communication buffer that has been reserved for StandaloneMmPkg
- ConfigurationTable = mMmst->MmConfigurationTable;
- for (Index = 0; Index < mMmst->NumberOfTableEntries; Index++) {
- if (CompareGuid (&gEfiHobListGuid, &(ConfigurationTable[Index].VendorGuid))) {
- break;
- }
- }
-
- // Bail out if the Hoblist could not be found
- if (Index >= mMmst->NumberOfTableEntries) {
- DEBUG ((DEBUG_ERROR, "Hoblist not found - 0x%x\n", Index));
- return EFI_OUT_OF_RESOURCES;
- }
-
- HobStart = ConfigurationTable[Index].VendorTable;
-
- //
- // Extract the MP information from the Hoblist
- //
- Status = GetGuidedHobData (
- HobStart,
- &gMpInformationHobGuid,
- (VOID **)&MpInformationHobData
- );
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "MpInformationHob extraction failed - 0x%x\n", Status));
- return Status;
- }
-
- //
- // Allocate memory for the MP information and copy over the MP information
- // passed by Trusted Firmware. Use the number of processors passed in the HOB
- // to copy the processor information
- //
- MpInfoSize = sizeof (MP_INFORMATION_HOB_DATA) +
- (sizeof (EFI_PROCESSOR_INFORMATION) *
- MpInformationHobData->NumberOfProcessors);
- Status = mMmst->MmAllocatePool (
- EfiRuntimeServicesData,
- MpInfoSize,
- (VOID **)&mMpInformationHobData
- );
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "mMpInformationHobData mem alloc failed - 0x%x\n", Status));
- return Status;
- }
-
- CopyMem (mMpInformationHobData, MpInformationHobData, MpInfoSize);
-
- // Print MP information
- DEBUG ((
- DEBUG_INFO,
- "mMpInformationHobData: 0x%016lx - 0x%lx\n",
- mMpInformationHobData->NumberOfProcessors,
- mMpInformationHobData->NumberOfEnabledProcessors
- ));
- for (Index = 0; Index < mMpInformationHobData->NumberOfProcessors; Index++) {
- DEBUG ((
- DEBUG_INFO,
- "mMpInformationHobData[0x%lx]: %d, %d, %d\n",
- mMpInformationHobData->ProcessorInfoBuffer[Index].ProcessorId,
- mMpInformationHobData->ProcessorInfoBuffer[Index].Location.Package,
- mMpInformationHobData->ProcessorInfoBuffer[Index].Location.Core,
- mMpInformationHobData->ProcessorInfoBuffer[Index].Location.Thread
- ));
- }
-
- //
- // Allocate memory for a table to hold pointers to a
- // EFI_MM_COMMUNICATE_HEADER for each CPU
- //
- ArraySize = sizeof (EFI_MM_COMMUNICATE_HEADER *) *
- mMpInformationHobData->NumberOfEnabledProcessors;
- Status = mMmst->MmAllocatePool (
- EfiRuntimeServicesData,
- ArraySize,
- (VOID **)&PerCpuGuidedEventContext
- );
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "PerCpuGuidedEventContext mem alloc failed - 0x%x\n", Status));
- return Status;
- }
-
return Status;
}
diff --git a/StandaloneMmPkg/Include/Protocol/PiMmCpuDriverEp.h b/StandaloneMmPkg/Include/Protocol/PiMmCpuDriverEp.h index 7aaa4a2f18..4b2f61fa06 100644 --- a/StandaloneMmPkg/Include/Protocol/PiMmCpuDriverEp.h +++ b/StandaloneMmPkg/Include/Protocol/PiMmCpuDriverEp.h @@ -19,7 +19,8 @@ /**
The PI Standalone MM entry point for handling mm communication request
- Here is an example of how the PI_MM_CPU_DRIVER_EP_PROTOCOL is utilized in ARM:
+ Here is an example of how the EDKII_PI_MM_CPU_DRIVER_EP_PROTOCOL
+ is utilized in ARM:
1. StandaloneMmCoreEntryPoint loads StandaloneMmCore.
2. StandaloneMmCore dispatches all MM drivers,
including the StandaloneMmCpu driver.
@@ -33,7 +34,6 @@ See StandaloneMmPkg/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c
@param [in] EventId The event Id based on firmware.
- @param [in] CpuNumber The CPU number.
@param [in] CommBufferAddr Address of the communication buffer.
@retval EFI_SUCCESS Success.
@@ -46,7 +46,6 @@ typedef EFI_STATUS
(EFIAPI *EDKII_PI_MM_CPU_DRIVER_ENTRYPOINT)(
IN UINTN EventId,
- IN UINTN CpuNumber,
IN UINTN CommBufferAddr
);
diff --git a/StandaloneMmPkg/Include/StandaloneMmCpu.h b/StandaloneMmPkg/Include/StandaloneMmCpu.h index dbe6189b2b..fc3d81b6e6 100644 --- a/StandaloneMmPkg/Include/StandaloneMmCpu.h +++ b/StandaloneMmPkg/Include/StandaloneMmCpu.h @@ -30,16 +30,14 @@ extern EFI_MM_CPU_PROTOCOL mMmCpuState; //
// MM event handling specific declarations
//
-extern EFI_MM_COMMUNICATE_HEADER **PerCpuGuidedEventContext;
-extern MP_INFORMATION_HOB_DATA *mMpInformationHobData;
+extern EFI_MM_COMMUNICATE_HEADER *gGuidedEventContext;
extern EFI_MM_CONFIGURATION_PROTOCOL mMmConfig;
/**
The PI Standalone MM entry point for the CPU driver.
@param [in] EventId The event Id.
- @param [in] CpuNumber The CPU number.
- @param [in] NsCommBufferAddr Address of the NS common buffer.
+ @param [in] CommBufferAddr Address of the communication buffer.
@retval EFI_SUCCESS Success.
@retval EFI_INVALID_PARAMETER A parameter was invalid.
@@ -50,8 +48,7 @@ extern EFI_MM_CONFIGURATION_PROTOCOL mMmConfig; EFI_STATUS
PiMmStandaloneMmCpuDriverEntry (
IN UINTN EventId,
- IN UINTN CpuNumber,
- IN UINTN NsCommBufferAddr
+ IN UINTN CommBufferAddr
);
/**
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c index cf2f1ef4d4..81258f3c08 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEntryPoint.c @@ -26,7 +26,6 @@ #include <PiPei.h>
#include <Guid/MmramMemoryReserve.h>
-#include <Guid/MpInformation.h>
#include <Library/ArmLib.h>
#include <Library/ArmSvcLib.h>
@@ -52,7 +51,6 @@ extern EFI_MM_SYSTEM_TABLE gMmCoreMmst; VOID *gHobList = NULL;
-STATIC MP_INFORMATION_HOB_DATA *mMpInfo = NULL;
STATIC MISC_MM_COMMUNICATE_BUFFER *mMiscMmCommunicateBuffer = NULL;
STATIC EFI_MMRAM_DESCRIPTOR *mNsCommBuffer = NULL;
STATIC EFI_MMRAM_DESCRIPTOR *mSCommBuffer = NULL;
@@ -454,40 +452,6 @@ GetServiceType ( }
/**
- Get logical Cpu Number based on MpInformation hob data.
-
- @param [in] CommProtocol Abi Protocol.
- @param [in] EventCompleteSvcArgs Pointer to the event completion arguments.
-
- @retval CpuNumber Cpu Number
-**/
-STATIC
-UINTN
-EFIAPI
-GetCpuNumber (
- IN COMM_PROTOCOL CommProtocol,
- IN ARM_SVC_ARGS *EventCompleteSvcArgs
- )
-{
- UINTN Idx;
-
- if (CommProtocol == CommProtocolSpmMm) {
- Idx = EventCompleteSvcArgs->Arg3;
- } else {
- /*
- * There's no way to find out CPU number in StandaloneMm via FF-A v1.2.
- * Because StandaloneMm is S-EL0 partition, it couldn't read mpidr.
- * Currently, StandaloneMm is UP migratable SP so, just return idx 0.
- */
- Idx = 0;
- }
-
- ASSERT (Idx < mMpInfo->NumberOfProcessors);
-
- return Idx;
-}
-
-/**
Perform bounds check for the Ns and Secure Communication buffer.
NOTE: We do not need to validate the Misc Communication buffer as
@@ -531,8 +495,9 @@ ValidateMmCommBufferAddr ( }
// perform bounds check.
- if ((CommBufferRange - sizeof (EFI_MM_COMMUNICATE_HEADER)) <
- ((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->MessageLength)
+ if (((CommBufferAddr + sizeof (EFI_MM_COMMUNICATE_HEADER) +
+ ((EFI_MM_COMMUNICATE_HEADER *)CommBufferAddr)->MessageLength)) >
+ CommBufferEnd)
{
return EFI_ACCESS_DENIED;
}
@@ -541,47 +506,6 @@ ValidateMmCommBufferAddr ( }
/**
- Dump mp information descriptor.
-
- @param[in] ProcessorInfo Mp information
- @param[in] Idx Cpu index
-
-**/
-STATIC
-VOID
-EFIAPI
-DumpMpInfoDescriptor (
- EFI_PROCESSOR_INFORMATION *ProcessorInfo,
- UINTN Idx
- )
-{
- if (ProcessorInfo == NULL) {
- return;
- }
-
- DEBUG ((
- DEBUG_INFO,
- "CPU[%d]: MpIdr - 0x%lx\n",
- Idx,
- ProcessorInfo->ProcessorId
- ));
- DEBUG ((
- DEBUG_INFO,
- "CPU[%d]: StatusFlag - 0x%lx\n",
- Idx,
- ProcessorInfo->StatusFlag
- ));
- DEBUG ((
- DEBUG_INFO,
- "CPU[%d]: Location[P:C:T] - :%d:%d:%d\n",
- Idx,
- ProcessorInfo->Location.Package,
- ProcessorInfo->Location.Core,
- ProcessorInfo->Location.Thread
- ));
-}
-
-/**
Dump mmram descriptor.
@param[in] Name Name
@@ -645,7 +569,6 @@ DumpPhitHob ( {
EFI_HOB_FIRMWARE_VOLUME *FvHob;
EFI_HOB_GUID_TYPE *GuidHob;
- MP_INFORMATION_HOB_DATA *MpInfo;
EFI_MMRAM_HOB_DESCRIPTOR_BLOCK *MmramRangesHobData;
EFI_MMRAM_DESCRIPTOR *MmramDesc;
UINTN Idx;
@@ -659,23 +582,6 @@ DumpPhitHob ( DEBUG ((DEBUG_INFO, "FvHob: BaseAddress - 0x%lx\n", FvHob->BaseAddress));
DEBUG ((DEBUG_INFO, "FvHob: Length - %ld\n", FvHob->Length));
- GuidHob = GetNextGuidHob (&gMpInformationHobGuid, HobStart);
- if (GuidHob == NULL) {
- DEBUG ((DEBUG_ERROR, "Error: No MpInformation Guid Hob is present.\n"));
- return;
- }
-
- MpInfo = GET_GUID_HOB_DATA (GuidHob);
- DEBUG ((DEBUG_INFO, "Number of Cpus - %d\n", MpInfo->NumberOfProcessors));
- DEBUG ((
- DEBUG_INFO,
- "Number of Enabled Cpus - %d\n",
- MpInfo->NumberOfEnabledProcessors
- ));
- for (Idx = 0; Idx < MpInfo->NumberOfProcessors; Idx++) {
- DumpMpInfoDescriptor (&MpInfo->ProcessorInfoBuffer[Idx], Idx);
- }
-
GuidHob = GetNextGuidHob (&gEfiStandaloneMmNonSecureBufferGuid, HobStart);
if (GuidHob == NULL) {
DEBUG ((DEBUG_ERROR, "Error: No Ns Buffer Guid Hob is present.\n"));
@@ -937,7 +843,6 @@ DelegatedEventLoop ( )
{
EFI_STATUS Status;
- UINTN CpuNumber;
UINT64 Uuid[2];
VOID *CommData;
FFA_MSG_INFO FfaMsgInfo;
@@ -962,9 +867,6 @@ DelegatedEventLoop ( DEBUG ((DEBUG_INFO, "X6 : 0x%x\n", (UINT32)EventCompleteSvcArgs->Arg6));
DEBUG ((DEBUG_INFO, "X7 : 0x%x\n", (UINT32)EventCompleteSvcArgs->Arg7));
- CpuNumber = GetCpuNumber (CommProtocol, EventCompleteSvcArgs);
- DEBUG ((DEBUG_INFO, "CpuNumber: %d\n", CpuNumber));
-
if (CommProtocol == CommProtocolFfa) {
/*
* Register Convention for FF-A
@@ -1061,7 +963,7 @@ DelegatedEventLoop ( }
}
- Status = CpuDriverEntryPoint ((UINTN)ServiceType, CpuNumber, CommBufferAddr);
+ Status = CpuDriverEntryPoint ((UINTN)ServiceType, CommBufferAddr);
if (EFI_ERROR (Status)) {
DEBUG ((
DEBUG_ERROR,
@@ -1238,24 +1140,8 @@ CEntryPoint ( goto finish;
}
- // Set the gHobList to point to the HOB list saved in ConfigurationTable[].
gHobList = ConfigurationTable[Idx].VendorTable;
- //
- // Find MpInformation Hob in HobList.
- // It couldn't save address of mp information in gHobList
- // because that memory area will be reused after StandaloneMm finishing
- // initialization.
- //
- GuidHob = GetNextGuidHob (&gMpInformationHobGuid, gHobList);
- if (GuidHob == NULL) {
- Status = EFI_NOT_FOUND;
- DEBUG ((DEBUG_ERROR, "Error: No MpInformation hob ...\n"));
- goto finish;
- }
-
- mMpInfo = GET_GUID_HOB_DATA (GuidHob);
-
// Find the descriptor that contains the whereabouts of the buffer for
// communication with the Normal world.
GuidHob = GetNextGuidHob (&gEfiStandaloneMmNonSecureBufferGuid, gHobList);
|