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>,
	Ard Biesheuvel <ard.biesheuvel@arm.com>,
	Leif Lindholm <leif@nuviainc.com>,
	Sahil Malhotra <sahil.malhotra@linaro.org>,
	Achin Gupta <achin.gupta@arm.com>
Subject: [PATCH v2 11/13] StandaloneMmMmuLib: Add option to use FF-A calls to set memory region's permissions
Date: Mon, 14 Dec 2020 20:12:14 +0530	[thread overview]
Message-ID: <20201214144216.26328-12-sughosh.ganu@linaro.org> (raw)
In-Reply-To: <20201214144216.26328-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>
---
 ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c | 78 +++++++++++++-------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
index 893e291907..be63994920 100644
--- a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
+++ b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
@@ -97,45 +97,71 @@ RequestMemoryPermissionChange (
   IN  UINTN                     Permissions
   )
 {
+  BOOLEAN       FfaEnabled;
   EFI_STATUS    Status;
   ARM_SVC_ARGS  ChangeMemoryPermissionsSvcArgs = {0};
 
-  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) {
+    Status = ChangeMemoryPermissionsSvcArgs.Arg3;
+
+    switch (Status) {
+    case ARM_FFA_SPM_RET_INVALID_PARAMETERS:
+      return EFI_INVALID_PARAMETER;
+
+    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;
 
-  switch (Status) {
-  case ARM_SVC_SPM_RET_SUCCESS:
-    Status = EFI_SUCCESS;
-    break;
+    case ARM_FFA_SPM_RET_ABORTED:
+      return EFI_ABORTED;
 
-  case ARM_SVC_SPM_RET_NOT_SUPPORTED:
-    Status = EFI_UNSUPPORTED;
-    break;
+    default:
+      return EFI_SUCCESS;
+    }
+  } else {
+    Status = ChangeMemoryPermissionsSvcArgs.Arg0;
+    switch (Status) {
 
-  case ARM_SVC_SPM_RET_INVALID_PARAMS:
-    Status = EFI_INVALID_PARAMETER;
-    break;
+    case ARM_SVC_SPM_RET_NOT_SUPPORTED:
+      return EFI_UNSUPPORTED;
 
-  case ARM_SVC_SPM_RET_DENIED:
-    Status = EFI_ACCESS_DENIED;
-    break;
+    case ARM_SVC_SPM_RET_INVALID_PARAMS:
+      return EFI_INVALID_PARAMETER;
 
-  case ARM_SVC_SPM_RET_NO_MEMORY:
-    Status = EFI_BAD_BUFFER_SIZE;
-    break;
+    case ARM_SVC_SPM_RET_DENIED:
+      return EFI_ACCESS_DENIED;
 
-  default:
-    Status = EFI_ACCESS_DENIED;
-    ASSERT (0);
-  }
+    case ARM_SVC_SPM_RET_NO_MEMORY:
+      return EFI_BAD_BUFFER_SIZE;
 
-  return Status;
+    default:
+      return EFI_SUCCESS;
+    }
+  }
 }
 
 EFI_STATUS
-- 
2.17.1


  parent reply	other threads:[~2020-12-14 14:42 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-14 14:42 [PATCH v2 00/13] Add support for using FF-A calls Sughosh Ganu
2020-12-14 14:42 ` [PATCH v2 01/13] ArmPkg/IndustryStandard: Add barebones FF-A header Sughosh Ganu
2021-01-05 12:12   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 02/13] ArmPkg/ArmSvcLib: Return x4-x7 in output parameters Sughosh Ganu
2021-01-05 12:16   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 03/13] StandaloneMmPkg: Use FF-A header file in Standalone MM Core entry point Sughosh Ganu
2021-01-05 12:19   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 04/13] ArmPkg: Introduce support for PcdFfaEnable Sughosh Ganu
2021-01-05 13:53   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 05/13] StandaloneMmPkg: Add macros for SPM version Sughosh Ganu
2021-01-04 17:01   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 06/13] StandaloneMmPkg: Add the SPM version for FF-A Sughosh Ganu
2021-01-05 13:58   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 07/13] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version Sughosh Ganu
2021-01-05 14:18   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 08/13] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM Sughosh Ganu
2021-01-04 17:34   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 09/13] StandaloneMmPkg: Use FF-A header file in Standalone MM Arm MMU library Sughosh Ganu
2021-01-05 14:23   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 10/13] StandaloneMmMmuLib: Add option to use FF-A calls to get memory region's permissions Sughosh Ganu
2020-12-14 14:42 ` Sughosh Ganu [this message]
2020-12-14 14:42 ` [PATCH v2 12/13] MdeModulePkg/VariableStandaloneMm: Set PcdFlashNvStorageVariableBase to Pcd Sughosh Ganu
2021-01-05 12:04   ` [edk2-devel] " Sami Mujawar
2020-12-14 14:42 ` [PATCH v2 13/13] StandaloneMmPkg: Allow sending FFA Direct Request message to StandaloneMm Sughosh Ganu
2021-01-05 12:09   ` [edk2-devel] " 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=20201214144216.26328-12-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