diff options
| -rw-r--r-- | bl31/bl31_context_mgmt.c | 67 | ||||
| -rw-r--r-- | include/lib/el3_runtime/context_mgmt.h | 10 |
2 files changed, 0 insertions, 77 deletions
diff --git a/bl31/bl31_context_mgmt.c b/bl31/bl31_context_mgmt.c index 7d2c8938..f868372a 100644 --- a/bl31/bl31_context_mgmt.c +++ b/bl31/bl31_context_mgmt.c @@ -61,70 +61,3 @@ void cm_set_context_by_index(unsigned int cpu_idx, void *context, set_cpu_data_by_index(cpu_idx, cpu_context[security_state], context); } - -#if !ERROR_DEPRECATED -/* - * These context management helpers are deprecated but are maintained for use - * by SPDs which have not migrated to the new API. If ERROR_DEPRECATED - * is enabled, these are excluded from the build so as to force users to - * migrate to the new API. - */ - -/******************************************************************************* - * This function returns a pointer to the most recent 'cpu_context' structure - * for the CPU identified by MPIDR that was set as the context for the specified - * security state. NULL is returned if no such structure has been specified. - ******************************************************************************/ -void *cm_get_context_by_mpidr(uint64_t mpidr, uint32_t security_state) -{ - assert(sec_state_is_valid(security_state)); - - /* - * Suppress deprecated declaration warning in compatibility function - */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - return cm_get_context_by_index(platform_get_core_pos(mpidr), security_state); -#pragma GCC diagnostic pop -} - -/******************************************************************************* - * This function sets the pointer to the current 'cpu_context' structure for the - * specified security state for the CPU identified by MPIDR - ******************************************************************************/ -void cm_set_context_by_mpidr(uint64_t mpidr, void *context, uint32_t security_state) -{ - assert(sec_state_is_valid(security_state)); - - /* - * Suppress deprecated declaration warning in compatibility function - */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - cm_set_context_by_index(platform_get_core_pos(mpidr), - context, security_state); -#pragma GCC diagnostic pop -} - -/******************************************************************************* - * The following function provides a compatibility function for SPDs using the - * existing cm library routines. This function is expected to be invoked for - * initializing the cpu_context for the CPU specified by MPIDR for first use. - ******************************************************************************/ -void cm_init_context(uint64_t mpidr, const entry_point_info_t *ep) -{ - if ((mpidr & MPIDR_AFFINITY_MASK) == - (read_mpidr_el1() & MPIDR_AFFINITY_MASK)) - cm_init_my_context(ep); - else { - /* - * Suppress deprecated declaration warning in compatibility - * function - */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - cm_init_context_by_index(platform_get_core_pos(mpidr), ep); -#pragma GCC diagnostic pop - } -} -#endif /* ERROR_DEPRECATED */ diff --git a/include/lib/el3_runtime/context_mgmt.h b/include/lib/el3_runtime/context_mgmt.h index e3f7726a..c5bbb2b4 100644 --- a/include/lib/el3_runtime/context_mgmt.h +++ b/include/lib/el3_runtime/context_mgmt.h @@ -47,16 +47,6 @@ void cm_write_scr_el3_bit(uint32_t security_state, void cm_set_next_eret_context(uint32_t security_state); uint32_t cm_get_scr_el3(uint32_t security_state); - -void cm_init_context(uint64_t mpidr, - const struct entry_point_info *ep) __deprecated; - -void *cm_get_context_by_mpidr(uint64_t mpidr, - uint32_t security_state) __deprecated; -void cm_set_context_by_mpidr(uint64_t mpidr, - void *context, - uint32_t security_state) __deprecated; - /* Inline definitions */ /******************************************************************************* |