diff options
| author | danh-arm <dan.handley@arm.com> | 2015-03-17 14:23:46 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-03-17 14:23:46 +0000 |
| commit | 27bc0106665eddf3e6f84101e73e27b823867bef (patch) | |
| tree | 951f6ed4e9e9b1fd0bc157719246471ba48f83af /lib | |
| parent | 09c731ebd62348f7acd9ab94be033f0ae176a87f (diff) | |
| parent | 12e7c4ab0bbc9d9d4e950bdbda5a86f61c13bc1a (diff) | |
Merge pull request #268 from vikramkanigiri/vk/move_init_cpu_ops
Initialise cpu ops after enabling data cache
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cpu_helpers.S | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S index bebe7c0a..24c283ab 100644 --- a/lib/cpus/aarch64/cpu_helpers.S +++ b/lib/cpus/aarch64/cpu_helpers.S @@ -110,7 +110,8 @@ func prepare_cluster_pwr_dwn /* * Initializes the cpu_ops_ptr if not already initialized - * in cpu_data. This can be called without a runtime stack. + * in cpu_data. This can be called without a runtime stack, but may + * only be called after the MMU is enabled. * clobbers: x0 - x6, x10 */ .globl init_cpu_ops @@ -125,18 +126,6 @@ func init_cpu_ops ASM_ASSERT(ne) #endif str x0, [x6, #CPU_DATA_CPU_OPS_PTR]! - - /* - * Make sure that any pre-fetched cache copies are invalidated. - * Ensure that we are running with cache disable else we - * invalidate our own update. - */ -#if ASM_ASSERTION - mrs x1, sctlr_el3 - tst x1, #SCTLR_C_BIT - ASM_ASSERT(eq) -#endif - dc ivac, x6 mov x30, x10 1: ret |