diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-11-30 10:48:44 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-12-10 16:01:48 +0000 |
commit | 302d3d076fc41538850da09c318017f3e1ecb602 (patch) | |
tree | f8878b742b8849d08202d8e23bcdf49ca8c816db /include | |
parent | f6164aabe5b01b705a1e224ba4a254d4496e3667 (diff) | |
download | tf-a-tests-302d3d076fc41538850da09c318017f3e1ecb602.tar.gz |
SPM: Import SPCI and SPRT headers
Change-Id: I0abd16e486aa500aed0108786dbae6eb90a49c1f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/runtime_services/spci_svc.h | 121 | ||||
-rw-r--r-- | include/runtime_services/sprt_svc.h | 53 |
2 files changed, 160 insertions, 14 deletions
diff --git a/include/runtime_services/spci_svc.h b/include/runtime_services/spci_svc.h new file mode 100644 index 000000000..eae4fb7fe --- /dev/null +++ b/include/runtime_services/spci_svc.h @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2018, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef SPCI_SVC_H +#define SPCI_SVC_H + +#include <smccc.h> +#include <utils_def.h> + +/* SPCI_VERSION helpers */ + +#define SPCI_VERSION_MAJOR U(0) +#define SPCI_VERSION_MAJOR_SHIFT 16 +#define SPCI_VERSION_MAJOR_MASK U(0x7FFF) +#define SPCI_VERSION_MINOR U(1) +#define SPCI_VERSION_MINOR_SHIFT 0 +#define SPCI_VERSION_MINOR_MASK U(0xFFFF) +#define SPCI_VERSION_FORM(major, minor) ((((major) & SPCI_VERSION_MAJOR_MASK) \ + << SPCI_VERSION_MAJOR_SHIFT) | \ + ((minor) & SPCI_VERSION_MINOR_MASK)) +#define SPCI_VERSION_COMPILED SPCI_VERSION_FORM(SPCI_VERSION_MAJOR, \ + SPCI_VERSION_MINOR) + +/* Definitions to build the complete SMC ID */ + +#define SPCI_FID_MISC_FLAG (U(0) << 27) +#define SPCI_FID_MISC_SHIFT U(20) +#define SPCI_FID_MISC_MASK U(0x7F) + +#define SPCI_FID_TUN_FLAG (U(1) << 27) +#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) | \ + (U(1) << 31) | (spci_fid)) +#define SPCI_MISC_32(misc_fid) ((SMC_32 << FUNCID_CC_SHIFT) | \ + SPCI_FID_MISC_FLAG | \ + SPCI_SMC((misc_fid) << SPCI_FID_MISC_SHIFT)) +#define SPCI_MISC_64(misc_fid) ((SMC_64 << FUNCID_CC_SHIFT) | \ + SPCI_FID_MISC_FLAG | \ + SPCI_SMC((misc_fid) << SPCI_FID_MISC_SHIFT)) +#define SPCI_TUN_32(tun_fid) ((SMC_32 << FUNCID_CC_SHIFT) | \ + SPCI_FID_TUN_FLAG | \ + SPCI_SMC((tun_fid) << SPCI_FID_TUN_SHIFT)) +#define SPCI_TUN_64(tun_fid) ((SMC_64 << FUNCID_CC_SHIFT) | \ + SPCI_FID_TUN_FLAG | \ + SPCI_SMC((tun_fid) << SPCI_FID_TUN_SHIFT)) + +/* SPCI miscellaneous functions */ + +#define SPCI_FID_VERSION U(0x0) +#define SPCI_FID_SERVICE_HANDLE_OPEN U(0x2) +#define SPCI_FID_SERVICE_HANDLE_CLOSE U(0x3) +#define SPCI_FID_SERVICE_MEM_REGISTER U(0x4) +#define SPCI_FID_SERVICE_MEM_UNREGISTER U(0x5) +#define SPCI_FID_SERVICE_MEM_PUBLISH U(0x6) +#define SPCI_FID_SERVICE_REQUEST_BLOCKING U(0x7) +#define SPCI_FID_SERVICE_REQUEST_START U(0x8) +#define SPCI_FID_SERVICE_GET_RESPONSE U(0x9) +#define SPCI_FID_SERVICE_RESET_CLIENT_STATE U(0xA) + +/* SPCI tunneling functions */ + +#define SPCI_FID_SERVICE_TUN_REQUEST_START U(0x0) +#define SPCI_FID_SERVICE_REQUEST_RESUME U(0x1) +#define SPCI_FID_SERVICE_TUN_REQUEST_BLOCKING U(0x2) + +/* Complete SMC IDs and associated values */ + +#define SPCI_VERSION SPCI_MISC_32(SPCI_FID_VERSION) + +#define SPCI_SERVICE_HANDLE_OPEN SPCI_MISC_32(SPCI_FID_SERVICE_HANDLE_OPEN) +#define SPCI_SERVICE_HANDLE_OPEN_NOTIFY_BIT U(1) + +#define SPCI_SERVICE_HANDLE_CLOSE SPCI_MISC_32(SPCI_FID_SERVICE_HANDLE_CLOSE) + +#define SPCI_SERVICE_MEM_REGISTER_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_MEM_REGISTER) +#define SPCI_SERVICE_MEM_REGISTER_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_MEM_REGISTER) + +#define SPCI_SERVICE_MEM_UNREGISTER_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_MEM_UNREGISTER) +#define SPCI_SERVICE_MEM_UNREGISTER_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_MEM_UNREGISTER) + +#define SPCI_SERVICE_MEM_PUBLISH_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_MEM_PUBLISH) +#define SPCI_SERVICE_MEM_PUBLISH_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_MEM_PUBLISH) + +#define SPCI_SERVICE_REQUEST_BLOCKING_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_REQUEST_BLOCKING) +#define SPCI_SERVICE_REQUEST_BLOCKING_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_REQUEST_BLOCKING) + +#define SPCI_SERVICE_REQUEST_START_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_REQUEST_START) +#define SPCI_SERVICE_REQUEST_START_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_REQUEST_START) + +#define SPCI_SERVICE_GET_RESPONSE_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_GET_RESPONSE) +#define SPCI_SERVICE_GET_RESPONSE_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_GET_RESPONSE) + +#define SPCI_SERVICE_RESET_CLIENT_STATE_AARCH32 SPCI_MISC_32(SPCI_FID_SERVICE_RESET_CLIENT_STATE) +#define SPCI_SERVICE_RESET_CLIENT_STATE_AARCH64 SPCI_MISC_64(SPCI_FID_SERVICE_RESET_CLIENT_STATE) + +#define SPCI_SERVICE_TUN_REQUEST_START_AARCH32 SPCI_TUN_32(SPCI_FID_SERVICE_TUN_REQUEST_START) +#define SPCI_SERVICE_TUN_REQUEST_START_AARCH64 SPCI_TUN_64(SPCI_FID_SERVICE_TUN_REQUEST_START) + +#define SPCI_SERVICE_REQUEST_RESUME_AARCH32 SPCI_TUN_32(SPCI_FID_SERVICE_REQUEST_RESUME) +#define SPCI_SERVICE_REQUEST_RESUME_AARCH64 SPCI_TUN_64(SPCI_FID_SERVICE_REQUEST_RESUME) + +#define SPCI_SERVICE_TUN_REQUEST_BLOCKING_AARCH32 SPCI_TUN_32(SPCI_FID_SERVICE_TUN_REQUEST_BLOCKING) +#define SPCI_SERVICE_TUN_REQUEST_BLOCKING_AARCH64 SPCI_TUN_64(SPCI_FID_SERVICE_TUN_REQUEST_BLOCKING) + +/* SPCI error codes. */ + +#define SPCI_SUCCESS 0 +#define SPCI_NOT_SUPPORTED -1 +#define SPCI_INVALID_PARAMETER -2 +#define SPCI_NO_MEMORY -3 +#define SPCI_BUSY -4 +#define SPCI_QUEUED -5 +#define SPCI_DENIED -6 +#define SPCI_NOT_PRESENT -7 + +#endif /* SPCI_SVC_H */ diff --git a/include/runtime_services/sprt_svc.h b/include/runtime_services/sprt_svc.h index e789880b5..b6b51dd43 100644 --- a/include/runtime_services/sprt_svc.h +++ b/include/runtime_services/sprt_svc.h @@ -4,43 +4,68 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPRT_SVC_H__ -#define __SPRT_SVC_H__ +#ifndef SPRT_SVC_H +#define SPRT_SVC_H #include <smccc.h> #include <utils_def.h> /* SPRT_VERSION helpers */ + #define SPRT_VERSION_MAJOR U(0) #define SPRT_VERSION_MAJOR_SHIFT 16 #define SPRT_VERSION_MAJOR_MASK U(0x7FFF) -/* TODO: Move up minor version to 1 when SPRT is properly supported. */ -#define SPRT_VERSION_MINOR U(0) +#define SPRT_VERSION_MINOR U(1) #define SPRT_VERSION_MINOR_SHIFT 0 #define SPRT_VERSION_MINOR_MASK U(0xFFFF) -#define SPRT_VERSION_FORM(major, minor) ((((major) & SPRT_VERSION_MAJOR_MASK) << SPRT_VERSION_MAJOR_SHIFT) | \ +#define SPRT_VERSION_FORM(major, minor) ((((major) & SPRT_VERSION_MAJOR_MASK) \ + << SPRT_VERSION_MAJOR_SHIFT) | \ ((minor) & SPRT_VERSION_MINOR_MASK)) -#define SPRT_VERSION_COMPILED SPRT_VERSION_FORM(SPRT_VERSION_MAJOR, SPRT_VERSION_MINOR) - -/* TODO: Check all values below are correct when they're specified in SPRT. */ +#define SPRT_VERSION_COMPILED SPRT_VERSION_FORM(SPRT_VERSION_MAJOR, \ + SPRT_VERSION_MINOR) /* SPRT function IDs */ + #define SPRT_FID_VERSION U(0x0) -#define SPRT_FID_RETURN_RESPONSE U(0x1) +#define SPRT_FID_PUT_RESPONSE U(0x1) +#define SPRT_FID_YIELD U(0x5) +#define SPRT_FID_PANIC U(0x7) +#define SPRT_FID_MEMORY_PERM_ATTR_GET U(0xB) +#define SPRT_FID_MEMORY_PERM_ATTR_SET U(0xC) #define SPRT_FID_MASK U(0xFF) /* Definitions to build the complete SMC ID */ -#define SPRT_SMC_ID(sprt_fid) ((FUNCID_SERV_SPRT << FUNCID_SERV_SHIFT) | \ - (U(1) << 31) | ((sprt_fid) & SPRT_FID_MASK)) + +#define SPRT_SMC_64(sprt_fid) ((FUNCID_NAMESPACE_SPRT << FUNCID_NAMESPACE_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) | \ + (U(1) << 31) | ((sprt_fid) & SPRT_FID_MASK) | \ + (SMC_32 << FUNCID_CC_SHIFT)) /* Complete SMC IDs */ -#define SPRT_VERSION SPRT_SMC_ID(SPRT_FID_VERSION) -#define SPRT_RETURN_RESPONSE SPRT_SMC_ID(SPRT_FID_RETURN_RESPONSE) + +#define SPRT_VERSION SPRT_SMC_32(SPRT_FID_VERSION) +#define SPRT_PUT_RESPONSE_AARCH64 SPRT_SMC_64(SPRT_FID_PUT_RESPONSE) +#define SPRT_YIELD_AARCH64 SPRT_SMC_64(SPRT_FID_YIELD) +#define SPRT_PANIC_AARCH64 SPRT_SMC_64(SPRT_FID_PANIC) +#define SPRT_MEMORY_PERM_ATTR_GET_AARCH64 SPRT_SMC_64(SPRT_FID_MEMORY_PERM_ATTR_GET) +#define SPRT_MEMORY_PERM_ATTR_SET_AARCH64 SPRT_SMC_64(SPRT_FID_MEMORY_PERM_ATTR_SET) + +/* Defines used by SPRT_MEMORY_PERM_ATTR_{GET,SET}_AARCH64 */ + +#define SPRT_MEMORY_PERM_ATTR_RO U(0) +#define SPRT_MEMORY_PERM_ATTR_RW U(1) +#define SPRT_MEMORY_PERM_ATTR_RO_EXEC U(2) +/* U(3) is reserved */ +#define SPRT_MEMORY_PERM_ATTR_MASK U(3) +#define SPRT_MEMORY_PERM_ATTR_SHIFT 3 /* SPRT error codes. */ + #define SPRT_SUCCESS 0 #define SPRT_NOT_SUPPORTED -1 #define SPRT_INVALID_PARAMETER -2 -#endif /* __SPRT_SVC_H__ */ +#endif /* SPRT_SVC_H */ |