diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-30 16:01:49 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-30 16:01:49 +0000 |
| commit | 0709055ed66330fe7709c77d2dfbcb87f0c94272 (patch) | |
| tree | 31b5d3b7354ad9a8b1bb3e423762e5ea1235d05b /include/services | |
| parent | 7e9b0c8eef2b90f51ed41bb8ddf15d7c47672ca9 (diff) | |
Remove support for the SMC Calling Convention 2.0
This reverts commit 2f370465241c ("Add support for the SMC Calling
Convention 2.0").
SMCCC v2.0 is no longer required for SPM, and won't be needed in the
future. Removing it makes the SMC handling code less complicated.
The SPM implementation based on SPCI and SPRT was using it, but it has
been adapted to SMCCC v1.0.
Change-Id: I36795b91857b2b9c00437cfbfed04b3c1627f578
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include/services')
| -rw-r--r-- | include/services/spci_svc.h | 7 | ||||
| -rw-r--r-- | include/services/sprt_svc.h | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/services/spci_svc.h b/include/services/spci_svc.h index b82cf1e3..1d02bfa9 100644 --- a/include/services/spci_svc.h +++ b/include/services/spci_svc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2019, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -34,7 +34,10 @@ #define SPCI_FID_TUN_SHIFT U(24) #define SPCI_FID_TUN_MASK U(0x7) -#define SPCI_SMC(spci_fid) ((FUNCID_NAMESPACE_SPCI << FUNCID_NAMESPACE_SHIFT) | \ +#define OEN_SPCI_START U(0x30) +#define OEN_SPCI_END U(0x3F) + +#define SPCI_SMC(spci_fid) ((OEN_SPCI_START << FUNCID_OEN_SHIFT) | \ (U(1) << 31) | (spci_fid)) #define SPCI_MISC_32(misc_fid) ((SMC_32 << FUNCID_CC_SHIFT) | \ SPCI_FID_MISC_FLAG | \ diff --git a/include/services/sprt_svc.h b/include/services/sprt_svc.h index bd695e58..2421ea25 100644 --- a/include/services/sprt_svc.h +++ b/include/services/sprt_svc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2019, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -37,10 +37,13 @@ /* Definitions to build the complete SMC ID */ -#define SPRT_SMC_64(sprt_fid) ((FUNCID_NAMESPACE_SPRT << FUNCID_NAMESPACE_SHIFT) | \ +#define OEN_SPRT_START U(0x20) +#define OEN_SPRT_END U(0x2F) + +#define SPRT_SMC_64(sprt_fid) ((OEN_SPRT_START << FUNCID_OEN_SHIFT) | \ (U(1) << 31) | ((sprt_fid) & SPRT_FID_MASK) | \ (SMC_64 << FUNCID_CC_SHIFT)) -#define SPRT_SMC_32(sprt_fid) ((FUNCID_NAMESPACE_SPRT << FUNCID_NAMESPACE_SHIFT) | \ +#define SPRT_SMC_32(sprt_fid) ((OEN_SPRT_START << FUNCID_OEN_SHIFT) | \ (U(1) << 31) | ((sprt_fid) & SPRT_FID_MASK) | \ (SMC_32 << FUNCID_CC_SHIFT)) |