public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Sughosh Ganu" <sughosh.ganu@linaro.org>
To: devel@edk2.groups.io
Cc: Sami Mujawar <sami.mujawar@arm.com>,
	Ilias Apalodimas <ilias.apalodimas@linaro.org>,
	Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Achin Gupta <achin.gupta@arm.com>
Subject: [PATCH v5 12/14] ArmPkg: Allow FF-A calls to set memory region's attributes
Date: Fri, 19 Feb 2021 12:06:05 +0530	[thread overview]
Message-ID: <20210219063607.27920-13-sughosh.ganu@linaro.org> (raw)
In-Reply-To: <20210219063607.27920-1-sughosh.ganu@linaro.org>

From: Achin Gupta <achin.gupta@arm.com>

Allow setting memory region's permissions using either of 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>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
---

Changes since V4: None

 ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c | 88 +++++++++++++++-----
 1 file changed, 65 insertions(+), 23 deletions(-)

diff --git a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
index 14fe781630..a30369af9c 100644
--- a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
+++ b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
@@ -116,47 +116,89 @@ RequestMemoryPermissionChange (
   IN  UINTN                     Permissions
   )
 {
-  EFI_STATUS    Status;
+  INT32         Ret;
+  BOOLEAN       FfaEnabled;
   ARM_SVC_ARGS  ChangeMemoryPermissionsSvcArgs;
 
   ZeroMem (&ChangeMemoryPermissionsSvcArgs, sizeof (ARM_SVC_ARGS));
 
-  ChangeMemoryPermissionsSvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;
-  ChangeMemoryPermissionsSvcArgs.Arg1 = BaseAddress;
-  ChangeMemoryPermissionsSvcArgs.Arg2 = EFI_SIZE_TO_PAGES(Length);
-  ChangeMemoryPermissionsSvcArgs.Arg3 = Permissions;
+  FfaEnabled = FeaturePcdGet (PcdFfaEnable);
+
+  if (FfaEnabled) {
+    ChangeMemoryPermissionsSvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64;
+    ChangeMemoryPermissionsSvcArgs.Arg1 = ARM_FFA_DESTINATION_ENDPOINT_ID;
+    ChangeMemoryPermissionsSvcArgs.Arg2 = 0;
+    ChangeMemoryPermissionsSvcArgs.Arg3 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;
+    ChangeMemoryPermissionsSvcArgs.Arg4 = BaseAddress;
+    ChangeMemoryPermissionsSvcArgs.Arg5 = EFI_SIZE_TO_PAGES (Length);
+    ChangeMemoryPermissionsSvcArgs.Arg6 = Permissions;
+  } else {
+    ChangeMemoryPermissionsSvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;
+    ChangeMemoryPermissionsSvcArgs.Arg1 = BaseAddress;
+    ChangeMemoryPermissionsSvcArgs.Arg2 = EFI_SIZE_TO_PAGES (Length);
+    ChangeMemoryPermissionsSvcArgs.Arg3 = Permissions;
+  }
 
   ArmCallSvc (&ChangeMemoryPermissionsSvcArgs);
 
-  Status = ChangeMemoryPermissionsSvcArgs.Arg0;
+  if (FfaEnabled) {
+    // Setting memory attributes is an atomic call, with
+    // StandaloneMm at S-EL0 being the caller and the SPM
+    // core being the callee. Thus there won't be a
+    // FFA_INTERRUPT or FFA_SUCCESS response to the Direct
+    // Request sent above. This will have to be considered
+    // for other Direct Request calls which are not atomic
+    // We therefore check only for Direct Response by the
+    // callee.
+    if (ChangeMemoryPermissionsSvcArgs.Arg0 !=
+        ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64) {
+      // If Arg0 is not a Direct Response, that means we
+      // have an FF-A error. We need to check Arg2 for the
+      // FF-A error code.
+      Ret = ChangeMemoryPermissionsSvcArgs.Arg2;
+      switch (Ret) {
+      case ARM_FFA_SPM_RET_INVALID_PARAMETERS:
+        return EFI_INVALID_PARAMETER;
 
-  switch (Status) {
-  case ARM_SVC_SPM_RET_SUCCESS:
-    Status = EFI_SUCCESS;
-    break;
+      case ARM_FFA_SPM_RET_DENIED:
+        return EFI_NOT_READY;
+
+      case ARM_FFA_SPM_RET_NOT_SUPPORTED:
+        return EFI_UNSUPPORTED;
+
+      case ARM_FFA_SPM_RET_BUSY:
+        return EFI_NOT_READY;
+
+      case ARM_FFA_SPM_RET_ABORTED:
+        return EFI_ABORTED;
+      }
+    } else if (ChangeMemoryPermissionsSvcArgs.Arg0 ==
+               ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64) {
+      // A Direct Response means FF-A success
+      // Now check the payload for errors
+      // The callee sends back the return value
+      // in Arg3
+      Ret = ChangeMemoryPermissionsSvcArgs.Arg3;
+    }
+  } else {
+    Ret = ChangeMemoryPermissionsSvcArgs.Arg0;
+  }
 
+  switch (Ret) {
   case ARM_SVC_SPM_RET_NOT_SUPPORTED:
-    Status = EFI_UNSUPPORTED;
-    break;
+    return EFI_UNSUPPORTED;
 
   case ARM_SVC_SPM_RET_INVALID_PARAMS:
-    Status = EFI_INVALID_PARAMETER;
-    break;
+    return EFI_INVALID_PARAMETER;
 
   case ARM_SVC_SPM_RET_DENIED:
-    Status = EFI_ACCESS_DENIED;
-    break;
+    return EFI_ACCESS_DENIED;
 
   case ARM_SVC_SPM_RET_NO_MEMORY:
-    Status = EFI_BAD_BUFFER_SIZE;
-    break;
-
-  default:
-    Status = EFI_ACCESS_DENIED;
-    ASSERT (0);
+    return EFI_BAD_BUFFER_SIZE;
   }
 
-  return Status;
+  return EFI_SUCCESS;
 }
 
 EFI_STATUS
-- 
2.17.1


  parent reply	other threads:[~2021-02-19  6:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19  6:35 [PATCH v5 00/14] Add support for using FF-A calls Sughosh Ganu
2021-02-19  6:35 ` [PATCH v5 01/14] ArmPkg/IndustryStandard: Add barebones FF-A header Sughosh Ganu
2021-02-19  6:35 ` [PATCH v5 02/14] ArmPkg/ArmSvcLib: Return x4-x7 in output parameters Sughosh Ganu
2021-02-19  6:35 ` [PATCH v5 03/14] StandaloneMmPkg: Use FF-A header file in Standalone MM Core entry point Sughosh Ganu
2021-02-19  6:35 ` [PATCH v5 04/14] ArmPkg: Introduce support for PcdFfaEnable Sughosh Ganu
2021-02-22  9:28   ` [edk2-devel] " Sami Mujawar
2021-02-22 10:48   ` Ard Biesheuvel
2021-02-22 11:47     ` Sughosh Ganu
2021-02-22 14:05       ` Ard Biesheuvel
2021-02-19  6:35 ` [PATCH v5 05/14] ArmPkg: Add macros for SPM version Sughosh Ganu
2021-02-22  9:30   ` [edk2-devel] " Sami Mujawar
2021-02-19  6:35 ` [PATCH v5 06/14] StandaloneMmPkg: Use macros for SPM version check Sughosh Ganu
2021-02-22  9:31   ` [edk2-devel] " Sami Mujawar
2021-02-19  6:36 ` [PATCH v5 07/14] ArmPkg: Add macros for SPM version with FF-A support enabled Sughosh Ganu
2021-02-22  9:32   ` [edk2-devel] " Sami Mujawar
2021-02-19  6:36 ` [PATCH v5 08/14] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version Sughosh Ganu
2021-02-22  9:37   ` [edk2-devel] " Sami Mujawar
2021-02-19  6:36 ` [PATCH v5 09/14] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM Sughosh Ganu
2021-02-19  6:36 ` [PATCH v5 10/14] ArmPkg: Use FF-A header file in Standalone MM Arm MMU library Sughosh Ganu
2021-02-19  6:36 ` [PATCH v5 11/14] ArmPkg: Allow FF-A calls to get memory region's attributes Sughosh Ganu
2021-02-22  9:38   ` [edk2-devel] " Sami Mujawar
2021-02-19  6:36 ` Sughosh Ganu [this message]
2021-02-19  6:36 ` [PATCH v5 13/14] MdeModulePkg/VariableStandaloneMm: Set PcdFlashNvStorageVariableBase to Pcd Sughosh Ganu
2021-02-19  6:36 ` [PATCH v5 14/14] StandaloneMmPkg: Allow sending FFA Direct Request message to StandaloneMm Sughosh Ganu
2021-02-22 14:10 ` [PATCH v5 00/14] Add support for using FF-A calls Ard Biesheuvel
2021-02-22 15:19   ` Sughosh Ganu
2021-02-23 16:04     ` Sami Mujawar

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=20210219063607.27920-13-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