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 06/12] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version
Date: Wed, 21 Oct 2020 17:02:27 +0530 [thread overview]
Message-ID: <20201021113233.25548-7-sughosh.ganu@linaro.org> (raw)
In-Reply-To: <20201021113233.25548-1-sughosh.ganu@linaro.org>
From: Achin Gupta <achin.gupta@arm.com>
With the introduction of Firmware Framework(FF-A), a Secure Partition
can get the SPM version either using FF-A calls or through the
existing svc calls. Use a runtime check to use either of the two
methods based on the Pcd feature flag value.
Signed-off-by: Achin Gupta <achin.gupta@arm.com>
Co-developed-by: Sughosh Ganu <sughosh.ganu@linaro.org>
---
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf | 3 ++
StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 31 ++++++++++++++------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
index 7d6ee4e08e..f8184f501b 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
@@ -49,5 +49,8 @@
gEfiStandaloneMmNonSecureBufferGuid
gEfiArmTfCpuDriverEpDescriptorGuid
+[Pcd]
+ gArmTokenSpaceGuid.PcdFfaEnable
+
[BuildOptions]
GCC:*_*_*_CC_FLAGS = -fpie
diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
index 33f0db654f..7d1e3c4d7c 100644
--- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
+++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c
@@ -23,6 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/SerialPortLib.h>
+#include <Library/PcdLib.h>
#include <IndustryStandard/ArmStdSmc.h>
#include <IndustryStandard/ArmMmSvc.h>
@@ -165,19 +166,31 @@ EFI_STATUS
GetSpmVersion (VOID)
{
EFI_STATUS Status;
- UINT16 SpmMajorVersion;
- UINT16 SpmMinorVersion;
+ UINT16 CurSpmMajorVer;
+ UINT16 SpmMajorVer;
+ UINT16 CurSpmMinorVer;
+ UINT16 SpmMinorVer;
UINT32 SpmVersion;
ARM_SVC_ARGS SpmVersionArgs;
- SpmVersionArgs.Arg0 = ARM_SVC_ID_SPM_VERSION_AARCH32;
+ if (FeaturePcdGet (PcdFfaEnable)) {
+ SpmVersionArgs.Arg0 = ARM_SVC_ID_FFA_VERSION_AARCH32;
+ SpmVersionArgs.Arg1 = SPM_MAJOR_VER << SPM_MAJOR_VER_SHIFT;
+ SpmVersionArgs.Arg1 |= SPM_MINOR_VER;
+ SpmMajorVer = SPM_MAJOR_VER_FFA;
+ SpmMinorVer = SPM_MINOR_VER_FFA;
+ } else {
+ SpmVersionArgs.Arg0 = ARM_SVC_ID_SPM_VERSION_AARCH32;
+ SpmMajorVer = SPM_MAJOR_VER;
+ SpmMinorVer = SPM_MINOR_VER;
+ }
ArmCallSvc (&SpmVersionArgs);
SpmVersion = SpmVersionArgs.Arg0;
- SpmMajorVersion = ((SpmVersion & SPM_MAJOR_VER_MASK) >> SPM_MAJOR_VER_SHIFT);
- SpmMinorVersion = ((SpmVersion & SPM_MINOR_VER_MASK) >> 0);
+ CurSpmMajorVer = ((SpmVersion & SPM_MAJOR_VER_MASK) >> SPM_MAJOR_VER_SHIFT);
+ CurSpmMinorVer = ((SpmVersion & SPM_MINOR_VER_MASK) >> 0);
// Different major revision values indicate possibly incompatible functions.
// For two revisions, A and B, for which the major revision values are
@@ -186,17 +199,17 @@ GetSpmVersion (VOID)
// revision A must work in a compatible way with revision B.
// However, it is possible for revision B to have a higher
// function count than revision A.
- if ((SpmMajorVersion == SPM_MAJOR_VER) &&
- (SpmMinorVersion >= SPM_MINOR_VER))
+ if ((CurSpmMajorVer == SpmMajorVer) &&
+ (CurSpmMinorVer >= SpmMinorVer))
{
DEBUG ((DEBUG_INFO, "SPM Version: Major=0x%x, Minor=0x%x\n",
- SpmMajorVersion, SpmMinorVersion));
+ CurSpmMajorVer, CurSpmMinorVer));
Status = EFI_SUCCESS;
}
else
{
DEBUG ((DEBUG_INFO, "Incompatible SPM Versions.\n Current Version: Major=0x%x, Minor=0x%x.\n Expected: Major=0x%x, Minor>=0x%x.\n",
- SpmMajorVersion, SpmMinorVersion, SPM_MAJOR_VER, SPM_MINOR_VER));
+ CurSpmMajorVer, CurSpmMinorVer, SpmMajorVer, SpmMinorVer));
Status = EFI_UNSUPPORTED;
}
--
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 ` Sughosh Ganu [this message]
2020-11-23 10:10 ` [PATCH v1 06/12] StandaloneMmPkg: Add option to use FF-A calls for getting SPM version Sami Mujawar
2020-10-21 11:32 ` [PATCH v1 07/12] StandaloneMmPkg: Add option to use FF-A calls for communication with SPM Sughosh Ganu
2020-11-23 12:38 ` 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-7-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