Skip to content

Commit 5f7c5ba

Browse files
committed
[SQUASH ON REBASE] Revert "Update FFA run interface to intake context as input argument (#1526)"
This reverts commit 1cb266f.
1 parent 1cb266f commit 5f7c5ba

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

MdeModulePkg/Library/ArmFfaLib/ArmFfaCommon.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ ArmFfaLibPartitionInfoGet (
553553
554554
@param [in] PartId Partition id
555555
@param [in] CpuNumber Cpu number in partition
556-
@param [out] CtxFfaArgs Optional context of FFA_ARGS
557556
558557
@retval EFI_SUCCESS
559558
@retval Other Error
@@ -562,13 +561,11 @@ ArmFfaLibPartitionInfoGet (
562561
EFI_STATUS
563562
EFIAPI
564563
ArmFfaLibRun (
565-
IN UINT16 PartId,
566-
IN UINT16 CpuNumber,
567-
OUT ARM_FFA_ARGS *CtxFfaArgs OPTIONAL
564+
IN UINT16 PartId,
565+
IN UINT16 CpuNumber
568566
)
569567
{
570568
ARM_FFA_ARGS FfaArgs;
571-
EFI_STATUS Status;
572569

573570
ZeroMem (&FfaArgs, sizeof (ARM_FFA_ARGS));
574571

@@ -577,16 +574,7 @@ ArmFfaLibRun (
577574

578575
ArmCallFfa (&FfaArgs);
579576

580-
Status = FfaArgsToEfiStatus (&FfaArgs);
581-
if (EFI_ERROR (Status)) {
582-
return Status;
583-
}
584-
585-
if (CtxFfaArgs != NULL) {
586-
CopyMem (CtxFfaArgs, &FfaArgs, sizeof (ARM_FFA_ARGS));
587-
}
588-
589-
return Status;
577+
return FfaArgsToEfiStatus (&FfaArgs);
590578
}
591579

592580
/**

MdePkg/Include/Library/ArmFfaLib.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,10 @@ ArmFfaLibSpmIdGet (
297297
);
298298

299299
/**
300-
Restore the context which was interrupted with FFA_INTERRUPT (EFI_INTERRUPT_PENDING).
300+
Restore context which interrupted with FFA_INTERRUPT (EFI_INTERRUPT_PENDING).
301301
302302
@param [in] PartId Partition id
303303
@param [in] CpuNumber Cpu number in partition
304-
@param [out] CtxFfaArgs Optional context of FFA_ARGS
305304
306305
@retval EFI_SUCCESS
307306
@retval Other Error
@@ -310,9 +309,8 @@ ArmFfaLibSpmIdGet (
310309
EFI_STATUS
311310
EFIAPI
312311
ArmFfaLibRun (
313-
IN UINT16 PartId,
314-
IN UINT16 CpuNumber,
315-
OUT ARM_FFA_ARGS *CtxFfaArgs OPTIONAL
312+
IN UINT16 PartId,
313+
IN UINT16 CpuNumber
316314
);
317315

318316
/**

0 commit comments

Comments
 (0)