summaryrefslogtreecommitdiff
path: root/services/std_svc/psci/psci_common.c
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-06-16 12:41:58 +0100
committerdanh-arm <dan.handley@arm.com>2014-06-16 12:41:58 +0100
commit30e3b312f207fe520f66b6b32ee7da3599546935 (patch)
treee9f6d896f02074f059baba95ebc04dad5b86f833 /services/std_svc/psci/psci_common.c
parent5c633bdff3f23c00fcfb91c26b709e1b66b84d21 (diff)
parent08ab89d324e8d784f0d35b639b7c27b4ff3e5959 (diff)
Merge pull request #131 from athoelke/at/cm_get_context
Provide cm_get/set_context() for current CPU
Diffstat (limited to 'services/std_svc/psci/psci_common.c')
-rw-r--r--services/std_svc/psci/psci_common.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c
index b1ee10da..3cbacd7a 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);
/*