From: "Sughosh Ganu" <sughosh.ganu@linaro.org>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Achin Gupta <achin.gupta@arm.com>
Subject: [PATCH v1 07/12] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM
Date: Wed, 21 Oct 2020 17:02:28 +0530 [thread overview]
Message-ID: <20201021113233.25548-8-sughosh.ganu@linaro.org> (raw)
In-Reply-To: <20201021113233.25548-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>
---
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 68 ++++++++++++++++----
1 file changed, 54 insertions(+), 14 deletions(-)
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 7d1e3c4d7c..06a8f487f9 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -112,6 +112,7 @@ DelegatedEventLoop (
IN ARM_SVC_ARGS *EventCompleteSvcArgs
)
{
+ BOOLEAN FfaEnabled;
EFI_STATUS Status;
UINTN SvcStatus;
@@ -123,16 +124,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) {
@@ -156,8 +173,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;
+ }
}
}
@@ -216,6 +241,22 @@ GetSpmVersion (VOID)
return Status;
}
+STATIC
+VOID
+InitArmSvcArgs (ARM_SVC_ARGS *InitMmFoundationSvcArgs, EFI_STATUS *Status)
+{
+ 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 = *Status;
+ } else {
+ InitMmFoundationSvcArgs->Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
+ InitMmFoundationSvcArgs->Arg1 = *Status;
+ }
+}
+
/**
The entry point of Standalone MM Foundation.
@@ -329,7 +370,6 @@ _ModuleEntryPoint (
finish:
ZeroMem (&InitMmFoundationSvcArgs, sizeof(InitMmFoundationSvcArgs));
- InitMmFoundationSvcArgs.Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64;
- InitMmFoundationSvcArgs.Arg1 = Status;
+ InitArmSvcArgs(&InitMmFoundationSvcArgs, &Status);
DelegatedEventLoop (&InitMmFoundationSvcArgs);
}
--
2.17.1
next prev parent reply other threads:[~2020-10-21 11:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 11:32 [PATCH v1 00/12] Add support for using FF-A calls sughosh.ganu
2020-10-21 11:32 ` [PATCH v1 01/12] ArmPkg/IndustryStandard: Add barebones FF-A header Sughosh Ganu
2020-11-05 10:33 ` Sami Mujawar
2020-11-06 9:06 ` Sughosh Ganu
2020-10-21 11:32 ` [PATCH v1 02/12] ArmPkg/ArmSvcLib: Return x4-x7 in output parameters Sughosh Ganu
2020-11-10 12:02 ` Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 03/12] StandaloneMmPkg: Use FF-A header file in Standalone MM Core entry point Sughosh Ganu
2020-10-21 11:32 ` [PATCH v1 04/12] ArmPkg: Introduce support for PcdFfaEnable Sughosh Ganu
2020-11-19 9:56 ` Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 05/12] StandaloneMmPkg: Add the SPM version for FF-A Sughosh Ganu
2020-11-19 9:54 ` Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 06/12] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version Sughosh Ganu
2020-11-23 10:10 ` Sami Mujawar
2020-10-21 11:32 ` Sughosh Ganu [this message]
2020-11-23 12:38 ` [PATCH v1 07/12] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 08/12] StandaloneMmPkg: Use FF-A header file in Standalone MM Arm MMU library Sughosh Ganu
2020-10-21 11:32 ` [PATCH v1 09/12] ArmPkg/StandaloneMmMmuLib: Add option to use FF-A calls to get memory region's permissions Sughosh Ganu
2020-11-23 13:26 ` Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 10/12] ArmPkg/StandaloneMmMmuLib: Add option to use FF-A calls to set " Sughosh Ganu
2020-11-23 13:42 ` Sami Mujawar
[not found] ` <164A26E48323EBBE.21019@groups.io>
2020-11-23 14:21 ` [edk2-devel] " Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 11/12] MdeModulePkg/VariableStandaloneMm: Set PcdFlashNvStorageVariableBase to Pcd Sughosh Ganu
2020-11-23 13:52 ` Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 12/12] StandaloneMmPkg: Allow sending FFA Direct Request message to StandaloneMm Sughosh Ganu
2020-11-23 14:17 ` Sami Mujawar
2020-11-05 10:29 ` [PATCH v1 00/12] Add support for using FF-A calls Sami Mujawar
2020-11-23 14:33 ` Sami Mujawar
2020-11-24 7:48 ` Sughosh Ganu
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=20201021113233.25548-8-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