diff options
| author | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-05-14 17:09:32 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-06-11 12:10:16 +0100 |
| commit | 08ab89d324e8d784f0d35b639b7c27b4ff3e5959 (patch) | |
| tree | 72e3f55c277d2db0963ac8d27508d1e937d13dd0 /bl31/bl31_main.c | |
| parent | 977fbcd4e0842e590a961d6f40c14653caa9301a (diff) | |
Provide cm_get/set_context() for current CPU
All callers of cm_get_context() pass the calling CPU MPIDR to the
function. Providing a specialised version for the current
CPU results in a reduction in code size and better readability.
The current function has been renamed to cm_get_context_by_mpidr()
and the existing name is now used for the current-CPU version.
The same treatment has been done to cm_set_context(), although
only both forms are used at present in the PSCI and TSPD code.
Change-Id: I91cb0c2f7bfcb950a045dbd9ff7595751c0c0ffb
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index f79a1220..6765e60e 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -71,9 +71,6 @@ void bl31_lib_init() ******************************************************************************/ void bl31_main(void) { -#if DEBUG - unsigned long mpidr = read_mpidr(); -#endif /* Perform remaining generic architectural setup from EL3 */ bl31_arch_setup(); @@ -98,7 +95,7 @@ void bl31_main(void) * structure which has an exception stack allocated. The PSCI * service should have set the context. */ - assert(cm_get_context(mpidr, NON_SECURE)); + assert(cm_get_context(NON_SECURE)); cm_set_next_eret_context(NON_SECURE); cm_init_pcpu_ptr_cache(); write_vbar_el3((uint64_t) runtime_exceptions); @@ -195,7 +192,7 @@ void bl31_prepare_next_image_entry() * Save the args generated in BL2 for the image in the right context * used on its entry */ - ctx = cm_get_context(read_mpidr(), image_type); + ctx = cm_get_context(image_type); gp_regs = get_gpregs_ctx(ctx); memcpy(gp_regs, (void *)&next_image_info->args, sizeof(aapcs64_params_t)); |