diff options
Diffstat (limited to 'services/std_svc/psci')
| -rw-r--r-- | services/std_svc/psci/psci_afflvl_on.c | 2 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_afflvl_suspend.c | 3 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_common.c | 3 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_setup.c | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/services/std_svc/psci/psci_afflvl_on.c b/services/std_svc/psci/psci_afflvl_on.c index e3a1831..443e6af 100644 --- a/services/std_svc/psci/psci_afflvl_on.c +++ b/services/std_svc/psci/psci_afflvl_on.c @@ -378,7 +378,7 @@ static unsigned int psci_afflvl0_on_finish(unsigned long mpidr, * structure. The calling cpu should have set the * context already */ - 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); diff --git a/services/std_svc/psci/psci_afflvl_suspend.c b/services/std_svc/psci/psci_afflvl_suspend.c index 377afdf..a986e5c 100644 --- a/services/std_svc/psci/psci_afflvl_suspend.c +++ b/services/std_svc/psci/psci_afflvl_suspend.c @@ -180,7 +180,7 @@ static int psci_afflvl0_suspend(unsigned long mpidr, * The EL3 state to PoC since it will be accessed after a * reset with the caches turned off */ - saved_el3_state = get_el3state_ctx(cm_get_context(mpidr, NON_SECURE)); + saved_el3_state = get_el3state_ctx(cm_get_context(NON_SECURE)); flush_dcache_range((uint64_t) saved_el3_state, sizeof(*saved_el3_state)); /* Set the secure world (EL3) re-entry point after BL1 */ @@ -496,7 +496,6 @@ static unsigned int psci_afflvl0_suspend_finish(unsigned long mpidr, * structure. The non-secure context should have been * set on this cpu prior to suspension. */ - assert(cm_get_context(mpidr, NON_SECURE)); cm_set_next_eret_context(NON_SECURE); cm_init_pcpu_ptr_cache(); write_vbar_el3((uint64_t) runtime_exceptions); diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c index b1ee10d..3cbacd7 100644 --- a/services/std_svc/psci/psci_common.c +++ b/services/std_svc/psci/psci_common.c @@ -219,7 +219,6 @@ int psci_validate_mpidr(unsigned long mpidr, int level) void psci_get_ns_entry_info(unsigned int index) { unsigned long sctlr = 0, scr, el_status, id_aa64pfr0; - uint64_t mpidr = read_mpidr(); cpu_context_t *ns_entry_context; gp_regs_t *ns_entry_gpregs; @@ -253,7 +252,7 @@ void psci_get_ns_entry_info(unsigned int index) write_sctlr_el1(sctlr); /* Fulfill the cpu_on entry reqs. as per the psci spec */ - ns_entry_context = (cpu_context_t *) cm_get_context(mpidr, NON_SECURE); + ns_entry_context = (cpu_context_t *) cm_get_context(NON_SECURE); assert(ns_entry_context); /* diff --git a/services/std_svc/psci/psci_setup.c b/services/std_svc/psci/psci_setup.c index a1587b7..015beab 100644 --- a/services/std_svc/psci/psci_setup.c +++ b/services/std_svc/psci/psci_setup.c @@ -210,9 +210,9 @@ static void psci_init_aff_map_node(unsigned long mpidr, linear_id = platform_get_core_pos(mpidr); assert(linear_id < PLATFORM_CORE_COUNT); - cm_set_context(mpidr, - (void *) &psci_ns_context[linear_id], - NON_SECURE); + cm_set_context_by_mpidr(mpidr, + (void *) &psci_ns_context[linear_id], + NON_SECURE); } |