Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
9f0ee04f
Unverified
Commit
9f0ee04f
authored
7 years ago
by
davidcunado-arm
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1184 from antonio-nino-diaz-arm/an/bl31-in-dram
fvp: Disable SYSTEM_SUSPEND when ARM_BL31_IN_DRAM
parents
62854fce
7d44ac1e
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
plat/arm/board/fvp/fvp_pm.c
+12
-4
plat/arm/board/fvp/fvp_pm.c
plat/arm/board/fvp/include/platform_def.h
+1
-0
plat/arm/board/fvp/include/platform_def.h
services/std_svc/spm/secure_partition_setup.c
+0
-1
services/std_svc/spm/secure_partition_setup.c
with
13 additions
and
5 deletions
+13
-5
plat/arm/board/fvp/fvp_pm.c
View file @
9f0ee04f
...
...
@@ -402,12 +402,20 @@ plat_psci_ops_t plat_arm_psci_pm_ops = {
.
validate_ns_entrypoint
=
arm_validate_psci_entrypoint
,
.
translate_power_state_by_mpidr
=
fvp_translate_power_state_by_mpidr
,
.
get_node_hw_state
=
fvp_node_hw_state
,
#if !ARM_BL31_IN_DRAM
/*
* The TrustZone Controller is set up during the warmboot sequence after
* resuming the CPU from a SYSTEM_SUSPEND. If BL31 is located in SRAM
* this is not a problem but, if it is in TZC-secured DRAM, it tries to
* reconfigure the same memory it is running on, causing an exception.
*/
.
get_sys_suspend_power_state
=
fvp_get_sys_suspend_power_state
,
/*
* mem_protect is not supported in RESET_TO_BL31 and RESET_TO_SP_MIN,
* as that would require mapping in all of NS DRAM into BL31 or BL32.
*/
#endif
#if !RESET_TO_BL31 && !RESET_TO_SP_MIN
/*
* mem_protect is not supported in RESET_TO_BL31 and RESET_TO_SP_MIN,
* as that would require mapping in all of NS DRAM into BL31 or BL32.
*/
.
mem_protect_chk
=
arm_psci_mem_protect_chk
,
.
read_mem_protect
=
arm_psci_read_mem_protect
,
.
write_mem_protect
=
arm_nor_psci_write_mem_protect
,
...
...
This diff is collapsed.
Click to expand it.
plat/arm/board/fvp/include/platform_def.h
View file @
9f0ee04f
...
...
@@ -8,6 +8,7 @@
#define __PLATFORM_DEF_H__
#include <arm_def.h>
#include <arm_spm_def.h>
#include <board_arm_def.h>
#include <common_def.h>
#include <tzc400.h>
...
...
This diff is collapsed.
Click to expand it.
services/std_svc/spm/secure_partition_setup.c
View file @
9f0ee04f
...
...
@@ -6,7 +6,6 @@
#include <arch.h>
#include <arch_helpers.h>
#include <arm_spm_def.h>
#include <assert.h>
#include <common_def.h>
#include <context.h>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help