diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/runtime_services/smccc.h | 9 | ||||
| -rw-r--r-- | include/runtime_services/spci_svc.h | 7 | ||||
| -rw-r--r-- | include/runtime_services/sprt_svc.h | 9 |
3 files changed, 12 insertions, 13 deletions
diff --git a/include/runtime_services/smccc.h b/include/runtime_services/smccc.h index 506a84f..34930b6 100644 --- a/include/runtime_services/smccc.h +++ b/include/runtime_services/smccc.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 */ @@ -21,13 +21,6 @@ #define SMC_UNKNOWN -1 -/* TODO: Import SMCCC 2.0 properly instead of having this */ -#define FUNCID_NAMESPACE_SHIFT U(28) -#define FUNCID_NAMESPACE_MASK U(0x3) -#define FUNCID_NAMESPACE_WIDTH U(2) -#define FUNCID_NAMESPACE_SPRT U(2) -#define FUNCID_NAMESPACE_SPCI U(3) - /******************************************************************************* * Bit definitions inside the function id as per the SMC calling convention ******************************************************************************/ diff --git a/include/runtime_services/spci_svc.h b/include/runtime_services/spci_svc.h index eae4fb7..f0ea57e 100644 --- a/include/runtime_services/spci_svc.h +++ b/include/runtime_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/runtime_services/sprt_svc.h b/include/runtime_services/sprt_svc.h index b6b51dd..e662c28 100644 --- a/include/runtime_services/sprt_svc.h +++ b/include/runtime_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)) |