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:
parent
c2b43afc54
commit
2d94d4a0be
|
@ -56,6 +56,9 @@ Detailed changes since last release
|
||||||
is powered on, if a non zero context id parameter was passed in the PSCI
|
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.
|
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
|
ARM Trusted Firmware - version 0.2
|
||||||
==================================
|
==================================
|
||||||
|
|
||||||
|
|
|
@ -58,11 +58,6 @@ int fvp_affinst_on(unsigned long mpidr,
|
||||||
mailbox *fvp_mboxes;
|
mailbox *fvp_mboxes;
|
||||||
unsigned int psysr;
|
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
|
* It's possible to turn on only affinity level 0 i.e. a cpu
|
||||||
* on the FVP. Ignore any other affinity level.
|
* 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;
|
unsigned long cpu_setup, cci_setup, linear_id;
|
||||||
mailbox *fvp_mboxes;
|
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) {
|
switch (afflvl) {
|
||||||
case MPIDR_AFFLVL1:
|
case MPIDR_AFFLVL1:
|
||||||
if (state == PSCI_STATE_OFF) {
|
if (state == PSCI_STATE_OFF) {
|
||||||
|
@ -260,7 +249,6 @@ int fvp_affinst_suspend(unsigned long mpidr,
|
||||||
assert(0);
|
assert(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
exit:
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue