From: "Sughosh Ganu" <sughosh.ganu@linaro.org>
To: devel@edk2.groups.io
Cc: Sami Mujawar <sami.mujawar@arm.com>,
Ard Biesheuvel <ard.biesheuvel@arm.com>,
Leif Lindholm <leif@nuviainc.com>,
Sahil Malhotra <sahil.malhotra@linaro.org>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Achin Gupta <achin.gupta@arm.com>
Subject: [PATCH v3 08/13] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM
Date: Fri, 15 Jan 2021 11:43:59 +0530 [thread overview]
Message-ID: <20210115061404.13552-9-sughosh.ganu@linaro.org> (raw)
In-Reply-To: <20210115061404.13552-1-sughosh.ganu@linaro.org>
From: Achin Gupta <achin.gupta@arm.com>
Add support for reporting completion of a MM request using either the
Firmware Framework(FF-A) ABI transport or through the earlier used SVC
calls.
Signed-off-by: Achin Gupta <achin.gupta@arm.com>
Co-developed-by: Sughosh Ganu <sughosh.ganu@linaro.org>
---
Changes since V2:
* Add braces for if/else statements
* Add a check for EFI_NOT_FOUND as a possible return value from
LocateStandaloneMmCorePeCoffData in _ModuleEntryPoint function
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 88 ++++++++++++++++----
1 file changed, 74 insertions(+), 14 deletions(-)
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 25ead004e6..6c50f470aa 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -120,6 +120,7 @@ DelegatedEventLoop (
IN ARM_SVC_ARGS *EventCompleteSvcArgs
)
{
+ BOOLEAN FfaEnabled;
EFI_STATUS Status;
UINTN SvcStatus;
@@ -131,16 +132,32 @@ DelegatedEventLoop (
DEBUG ((DEBUG_INFO, "X1 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg1));
DEBUG ((DEBUG_INFO, "X2 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg2));
DEBUG ((DEBUG_INFO, "X3 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg3));
-
- Status = CpuDriverEntryPoint (
- EventCompleteSvcArgs->Arg0,
- EventCompleteSvcArgs->Arg3,
- EventCompleteSvcArgs->Arg1
- );
-
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status 0x%x\n",
- EventCompleteSvcArgs->Arg0, Status));
+ DEBUG ((DEBUG_INFO, "X4 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg4));
+ DEBUG ((DEBUG_INFO, "X5 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg5));
+ DEBUG ((DEBUG_INFO, "X6 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg6));
+ DEBUG ((DEBUG_INFO, "X7 : 0x%x\n", (UINT32) EventCompleteSvcArgs->Arg7));
+
+ FfaEnabled = FeaturePcdGet (PcdFfaEnable);
+ if (FfaEnabled) {
+ Status = CpuDriverEntryPoint (
+ EventCompleteSvcArgs->Arg0,
+ EventCompleteSvcArgs->Arg6,
+ EventCompleteSvcArgs->Arg3
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status 0x%x\n",
+ EventCompleteSvcArgs->Arg3, Status));
+ }
+ } else {
+ Status = CpuDriverEntryPoint (
+ EventCompleteSvcArgs->Arg0,
+ EventCompleteSvcArgs->Arg3,
+ EventCompleteSvcArgs->Arg1
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Failed delegated event 0x%x, Status 0x%x\n",
+ EventCompleteSvcArgs->Arg0, Status));
+ }
}
switch (Status) {
@@ -164,8 +181,16 @@ DelegatedEventLoop (
break;
}
- EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
- EventCompleteSvcArgs->Arg1 = SvcStatus;
+ if (FfaEnabled) {
+ EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64;
+ EventCompleteSvcArgs->Arg1 = 0;
+ EventCompleteSvcArgs->Arg2 = 0;
+ EventCompleteSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
+ EventCompleteSvcArgs->Arg4 = SvcStatus;
+ } else {
+ EventCompleteSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
+ EventCompleteSvcArgs->Arg1 = SvcStatus;
+ }
}
}
@@ -233,6 +258,32 @@ GetSpmVersion (VOID)
return Status;
}
+/**
+ Initialize parameters to be sent via SVC call.
+
+ @param[out] InitMmFoundationSvcArgs Args structure
+ @param[out] Ret Return Code
+
+**/
+STATIC
+VOID
+InitArmSvcArgs (
+ OUT ARM_SVC_ARGS *InitMmFoundationSvcArgs,
+ OUT INT32 *Ret
+ )
+{
+ if (FeaturePcdGet (PcdFfaEnable)) {
+ InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64;
+ InitMmFoundationSvcArgs->Arg1 = 0;
+ InitMmFoundationSvcArgs->Arg2 = 0;
+ InitMmFoundationSvcArgs->Arg3 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
+ InitMmFoundationSvcArgs->Arg4 = *Ret;
+ } else {
+ InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
+ InitMmFoundationSvcArgs->Arg1 = *Ret;
+ }
+}
+
/**
The entry point of Standalone MM Foundation.
@@ -255,6 +306,7 @@ _ModuleEntryPoint (
EFI_SECURE_PARTITION_BOOT_INFO *PayloadBootInfo;
ARM_SVC_ARGS InitMmFoundationSvcArgs;
EFI_STATUS Status;
+ INT32 Ret;
UINT32 SectionHeaderOffset;
UINT16 NumberOfSections;
VOID *HobStart;
@@ -346,8 +398,16 @@ _ModuleEntryPoint (
DEBUG ((DEBUG_INFO, "Shared Cpu Driver EP 0x%lx\n", (UINT64) CpuDriverEntryPoint));
finish:
+ if (Status == RETURN_UNSUPPORTED) {
+ Ret = -1;
+ } else if (Status == RETURN_INVALID_PARAMETER) {
+ Ret = -2;
+ } else if (Status == EFI_NOT_FOUND) {
+ Ret = -7;
+ } else {
+ Ret = 0;
+ }
ZeroMem (&InitMmFoundationSvcArgs, sizeof(InitMmFoundationSvcArgs));
- InitMmFoundationSvcArgs.Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
- InitMmFoundationSvcArgs.Arg1 = Status;
+ InitArmSvcArgs (&InitMmFoundationSvcArgs, &Ret);
DelegatedEventLoop (&InitMmFoundationSvcArgs);
}
--
2.17.1
next prev parent reply other threads:[~2021-01-15 6:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 6:13 [PATCH v3 00/13] Add support for using FF-A calls Sughosh Ganu
2021-01-15 6:13 ` [PATCH v3 01/13] ArmPkg/IndustryStandard: Add barebones FF-A header Sughosh Ganu
2021-02-13 10:28 ` [edk2-devel] " Ard Biesheuvel
2021-01-15 6:13 ` [PATCH v3 02/13] ArmPkg/ArmSvcLib: Return x4-x7 in output parameters Sughosh Ganu
2021-02-13 10:28 ` [edk2-devel] " Ard Biesheuvel
2021-01-15 6:13 ` [PATCH v3 03/13] StandaloneMmPkg: Use FF-A header file in Standalone MM Core entry point Sughosh Ganu
2021-01-15 6:13 ` [PATCH v3 04/13] ArmPkg: Introduce support for PcdFfaEnable Sughosh Ganu
2021-02-13 10:29 ` [edk2-devel] " Ard Biesheuvel
2021-01-15 6:13 ` [PATCH v3 05/13] StandaloneMmPkg: Add macros for SPM version Sughosh Ganu
2021-01-20 18:34 ` [edk2-devel] " Sami Mujawar
2021-01-15 6:13 ` [PATCH v3 06/13] StandaloneMmPkg: Add the SPM version for FF-A Sughosh Ganu
2021-01-20 18:38 ` [edk2-devel] " Sami Mujawar
2021-01-15 6:13 ` [PATCH v3 07/13] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version Sughosh Ganu
2021-01-15 6:13 ` Sughosh Ganu [this message]
2021-01-20 18:44 ` [edk2-devel] [PATCH v3 08/13] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM Sami Mujawar
2021-01-15 6:14 ` [PATCH v3 09/13] StandaloneMmPkg: Use FF-A header file in Standalone MM Arm MMU library Sughosh Ganu
2021-01-15 6:14 ` [PATCH v3 10/13] StandaloneMmMmuLib: Allow FF-A calls to get memory region's attributes Sughosh Ganu
2021-01-20 18:49 ` [edk2-devel] " Sami Mujawar
2021-01-15 6:14 ` [PATCH v3 11/13] StandaloneMmMmuLib: Allow FF-A calls to set " Sughosh Ganu
2021-01-20 18:52 ` [edk2-devel] " Sami Mujawar
2021-01-15 6:14 ` [PATCH v3 12/13] MdeModulePkg/VariableStandaloneMm: Set PcdFlashNvStorageVariableBase to Pcd Sughosh Ganu
2021-01-15 6:14 ` [PATCH v3 13/13] StandaloneMmPkg: Allow sending FFA Direct Request message to StandaloneMm Sughosh Ganu
2021-02-18 3:34 ` 回复: [edk2-devel] [PATCH v3 00/13] Add support for using FF-A calls gaoliming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210115061404.13552-9-sughosh.ganu@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox