SPM: Remove old interfaces and tests

Remove code based on MM_COMMUNICATE. Remove tests based on it.

Also, remove the now empty arm_def.h.

Change-Id: I08a2680b10df3a24c67abb10e5dc07fda99f6fb9
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

4 files changed, 3 insertions, 123 deletions

diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h
deleted file mode 100644
index a23fc50..0000000
--- a/include/plat/arm/common/arm_def.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __ARM_DEF_H__
-#define __ARM_DEF_H__
-
-/******************************************************************************
- * Definitions common to all ARM standard platforms
- *****************************************************************************/
-
-/*******************************************************************************
- * Location of the memory buffer shared between Normal World (i.e. TFTF) and the
- * Secure Partition (e.g. Cactus) to pass data associated to secure service
- * requests.
- * Note: This address has to match the one used in TF (see ARM_SP_IMAGE_NS_BUF_*
- * macros).
- ******************************************************************************/
-#define ARM_SECURE_SERVICE_BUFFER_BASE	0xff600000ull
-#define ARM_SECURE_SERVICE_BUFFER_SIZE	0x10000ull
-
-#endif /* __ARM_DEF_H__ */
diff --git a/include/runtime_services/secure_el0_payloads/mm_svc.h b/include/runtime_services/secure_el0_payloads/mm_svc.h
deleted file mode 100644
index 290fd7d..0000000
--- a/include/runtime_services/secure_el0_payloads/mm_svc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __MM_SVC_H__
-#define __MM_SVC_H__
-
-#include <utils_def.h>
-
-#define MM_VERSION_MAJOR	U(1)
-#define MM_VERSION_MAJOR_SHIFT	16
-#define MM_VERSION_MAJOR_MASK	U(0x7FFF)
-#define MM_VERSION_MINOR	U(0)
-#define MM_VERSION_MINOR_SHIFT	0
-#define MM_VERSION_MINOR_MASK	U(0xFFFF)
-#define MM_VERSION_FORM(major, minor)	((major << MM_VERSION_MAJOR_SHIFT) | (minor))
-#define MM_VERSION_COMPILED	MM_VERSION_FORM(MM_VERSION_MAJOR, MM_VERSION_MINOR)
-
-/*
- * SMC IDs defined in [1] for accessing MM services from the Non-secure world.
- * These FIDs occupy the range 0x40 - 0x5f.
- * [1] DEN0060A_ARM_MM_Interface_Specification.pdf
- */
-#define MM_VERSION_AARCH32		U(0x84000040)
-
-#define MM_COMMUNICATE_AARCH64		U(0xC4000041)
-#define MM_COMMUNICATE_AARCH32		U(0x84000041)
-
-#endif /* __MM_SVC_H__ */
diff --git a/include/runtime_services/secure_el0_payloads/secure_partition.h b/include/runtime_services/secure_el0_payloads/secure_partition.h
index 4ee466c..712337e 100644
--- a/include/runtime_services/secure_el0_payloads/secure_partition.h
+++ b/include/runtime_services/secure_el0_payloads/secure_partition.h
@@ -4,27 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SECURE_PARTITION_H__
-#define __SECURE_PARTITION_H__
+#ifndef SECURE_PARTITION_H
+#define SECURE_PARTITION_H
 
-#ifndef __ASSEMBLY__
-#include <cassert.h>
 #include <param_header.h>
 #include <types.h>
-#endif
 #include <utils_def.h>
 
 /*
- * Definitions used to access the members of secure_partition_boot_info from
- * assembly code.
- */
-#define SP_BOOT_INFO_STACK_BASE_OFFSET		U(32)
-#define SP_BOOT_INFO_IMAGE_SIZE_OFFSET		U(64)
-#define SP_BOOT_INFO_PCPU_STACK_SIZE_OFFSET	U(72)
-
-#ifndef __ASSEMBLY__
-
-/*
  * Flags used by the secure_partition_mp_info structure to describe the
  * characteristics of a cpu. Only a single flag is defined at the moment to
  * indicate the primary cpu.
@@ -43,60 +30,9 @@ typedef struct secure_partition_mp_info {
 
 typedef struct secure_partition_boot_info {
 	param_header_t		h;
-	uint64_t		sp_mem_base;
-	uint64_t		sp_mem_limit;
-	uint64_t		sp_image_base;
-	uint64_t		sp_stack_base;
-	uint64_t		sp_heap_base;
-	uint64_t		sp_ns_comm_buf_base;
-	uint64_t		sp_shared_buf_base;
-	uint64_t		sp_image_size;
-	uint64_t		sp_pcpu_stack_size;
-	uint64_t		sp_heap_size;
-	uint64_t		sp_ns_comm_buf_size;
-	uint64_t		sp_shared_buf_size;
-	uint32_t		num_sp_mem_regions;
 	uint32_t		num_cpus;
 	secure_partition_mp_info_t *mp_info;
 } secure_partition_boot_info_t;
 
-/*
- * This structure is used to pass data associated to secure service requests.
- */
-#define SPS_MAX_PAYLOAD_SIZE	32
-typedef struct secure_partition_request_info {
-	uint32_t		id;
-	uint64_t		data_size;
-	uint8_t			data[SPS_MAX_PAYLOAD_SIZE];
-} secure_partition_request_info_t;
-
-/* Define some fast secure partition requests (SPS) IDs. */
-#define SPS_TIMER_SLEEP			1
-#define SPS_CHECK_ALIVE			2
-
-#define CACTUS_FAST_REQUEST_SUCCESS	0xCACF900D
-
-secure_partition_request_info_t *create_sps_request(uint32_t id,
-						    const void *data,
-						    uint64_t data_size);
-
-/*
- * Compile time assertions related to the 'secure_partition_boot_info' structure
- * to ensure that the assembler and the compiler view of the offsets of the
- * structure members is the same.
- */
-CASSERT(SP_BOOT_INFO_STACK_BASE_OFFSET ==
-	__builtin_offsetof(secure_partition_boot_info_t, sp_stack_base), \
-	assert_secure_partition_boot_info_sp_stack_base_offset_mismatch);
-
-CASSERT(SP_BOOT_INFO_IMAGE_SIZE_OFFSET ==
-	__builtin_offsetof(secure_partition_boot_info_t, sp_image_size), \
-	assert_secure_partition_boot_info_sp_image_size_offset_mismatch);
-
-CASSERT(SP_BOOT_INFO_PCPU_STACK_SIZE_OFFSET ==
-	__builtin_offsetof(secure_partition_boot_info_t, sp_pcpu_stack_size), \
-	assert_secure_partition_boot_info_sp_pcpu_stack_size_offset_mismatch);
-
-#endif /* __ASSEMBLY__ */
 
-#endif /* __SECURE_PARTITION_H__ */
+#endif /* SECURE_PARTITION_H */
diff --git a/include/runtime_services/secure_el0_payloads/spm_svc.h b/include/runtime_services/secure_el0_payloads/spm_svc.h
index e3b6cc5..e1f9df3 100644
--- a/include/runtime_services/secure_el0_payloads/spm_svc.h
+++ b/include/runtime_services/secure_el0_payloads/spm_svc.h
@@ -33,7 +33,6 @@
  * They occupy the range 0x60-0x7f.
  */
 #define SPM_VERSION_AARCH32			U(0x84000060)
-#define SP_EVENT_COMPLETE_AARCH64		U(0xC4000061)
 #define SP_MEMORY_ATTRIBUTES_GET_AARCH64	U(0xC4000064)
 #define SP_MEMORY_ATTRIBUTES_SET_AARCH64	U(0xC4000065)