andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove check on non-secure entrypoint parameter 

In fvp_affinst_on/suspend, the non-secure entrypoint is always
expected to lie in the DRAM. This check will not be valid if
non-secure code executes directly out of flash e.g. a baremetal
test. This patch removes this check.

Change-Id: I0436e1138fc394aae8ff1ea59ebe38b46a440b61
This commit is contained in:
Achin Gupta 2013-11-05 11:10:38 +00:00 committed by Dan Handley
parent c2b43afc54
commit 2d94d4a0be
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/change-log.md
View File

@ -56,6 +56,9 @@ Detailed changes since last release
is powered on, if a non zero context id parameter was passed in the PSCI
CPU_ON and CPU_SUSPEND api calls has been corrected.
* A restriction in the FVP code which did not allow the non-secure entrypoint
to lie outside the DRAM has been removed.
ARM Trusted Firmware - version 0.2
==================================

12
plat/fvp/fvp_pm.c
View File

@ -58,11 +58,6 @@ int fvp_affinst_on(unsigned long mpidr,
mailbox *fvp_mboxes;
unsigned int psysr;
if (ns_entrypoint < DRAM_BASE) {
rc = PSCI_E_INVALID_PARAMS;
goto exit;
}
/*
* It's possible to turn on only affinity level 0 i.e. a cpu
* on the FVP. Ignore any other affinity level.
@ -193,12 +188,6 @@ int fvp_affinst_suspend(unsigned long mpidr,
unsigned long cpu_setup, cci_setup, linear_id;
mailbox *fvp_mboxes;
/* Cannot allow NS world to execute trusted firmware code */
if (ns_entrypoint < DRAM_BASE) {
rc = PSCI_E_INVALID_PARAMS;
goto exit;
}
switch (afflvl) {
case MPIDR_AFFLVL1:
if (state == PSCI_STATE_OFF) {
@ -260,7 +249,6 @@ int fvp_affinst_suspend(unsigned long mpidr,
assert(0);
}
exit:
return rc;
}