diff options
| author | danh-arm <dan.handley@arm.com> | 2014-07-28 14:24:52 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-07-28 14:24:52 +0100 |
| commit | d9b1128b438748ce7ccfd33804321da2eed6fcfd (patch) | |
| tree | 838d8022c6db8516721432ec43bd64f7614516a9 /plat/fvp | |
| parent | 592dd7cbe658cc33ae2818c9ed543ac57e97f784 (diff) | |
| parent | 539a7b383d52493a94df4f5da8f74aa102429fa0 (diff) | |
Merge pull request #169 from achingupta/ag/tf-issues#198
Ag/tf issues#198
Diffstat (limited to 'plat/fvp')
| -rw-r--r-- | plat/fvp/aarch64/fvp_common.c | 2 | ||||
| -rw-r--r-- | plat/fvp/fvp_pm.c | 18 | ||||
| -rw-r--r-- | plat/fvp/include/platform_def.h | 7 |
3 files changed, 9 insertions, 18 deletions
diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c index 3fe3a21..3926239 100644 --- a/plat/fvp/aarch64/fvp_common.c +++ b/plat/fvp/aarch64/fvp_common.c @@ -119,7 +119,7 @@ const unsigned int num_sec_irqs = sizeof(irq_sec_array) / mmap_add(fvp_mmap); \ init_xlat_tables(); \ \ - enable_mmu_el##_el(); \ + enable_mmu_el##_el(0); \ } /* Define EL1 and EL3 variants of the function initialising the MMU */ diff --git a/plat/fvp/fvp_pm.c b/plat/fvp/fvp_pm.c index 55f465b..22e53e1 100644 --- a/plat/fvp/fvp_pm.c +++ b/plat/fvp/fvp_pm.c @@ -120,11 +120,10 @@ exit: * platform to decide whether the cluster is being turned off and take apt * actions. * - * CAUTION: This function is called with coherent stacks so that caches can be - * turned off, flushed and coherency disabled. There is no guarantee that caches - * will remain turned on across calls to this function as each affinity level is - * dealt with. So do not write & read global variables across calls. It will be - * wise to do flush a write to the global to prevent unpredictable results. + * CAUTION: There is no guarantee that caches will remain turned on across calls + * to this function as each affinity level is dealt with. So do not write & read + * global variables across calls. It will be wise to do flush a write to the + * global to prevent unpredictable results. ******************************************************************************/ int fvp_affinst_off(unsigned long mpidr, unsigned int afflvl, @@ -192,11 +191,10 @@ int fvp_affinst_off(unsigned long mpidr, * platform to decide whether the cluster is being turned off and take apt * actions. * - * CAUTION: This function is called with coherent stacks so that caches can be - * turned off, flushed and coherency disabled. There is no guarantee that caches - * will remain turned on across calls to this function as each affinity level is - * dealt with. So do not write & read global variables across calls. It will be - * wise to do flush a write to the global to prevent unpredictable results. + * CAUTION: There is no guarantee that caches will remain turned on across calls + * to this function as each affinity level is dealt with. So do not write & read + * global variables across calls. It will be wise to do flush a write to the + * global to prevent unpredictable results. ******************************************************************************/ int fvp_affinst_suspend(unsigned long mpidr, unsigned long sec_entrypoint, diff --git a/plat/fvp/include/platform_def.h b/plat/fvp/include/platform_def.h index ec4cf52..9983266 100644 --- a/plat/fvp/include/platform_def.h +++ b/plat/fvp/include/platform_def.h @@ -47,13 +47,6 @@ /* Size of cacheable stacks */ #define PLATFORM_STACK_SIZE 0x800 -/* Size of coherent stacks for debug and release builds */ -#if DEBUG -#define PCPU_DV_MEM_STACK_SIZE 0x400 -#else -#define PCPU_DV_MEM_STACK_SIZE 0x300 -#endif - #define FIRMWARE_WELCOME_STR "Booting trusted firmware boot loader stage 1\n\r" /* Trusted Boot Firmware BL2 */ |