diff options
author | davidcunado-arm <david.cunado@arm.com> | 2017-09-07 00:40:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 00:40:59 +0100 |
commit | 413115e1529a2c2211bac5d3cd1249070e0a8a88 (patch) | |
tree | 552cd80dbdf682f4b17af3c1703db733a48480fb /lib/el3_runtime | |
parent | e524d78f9fc904b0e831855145320384e9656a46 (diff) | |
parent | 86606eb51e81b4189579e2b429f1c8f26f5c804c (diff) | |
download | trusted-firmware-a-413115e1529a2c2211bac5d3cd1249070e0a8a88.tar.gz |
Merge pull request #1019 from etienne-lms/log-size
CPU_DATA_LOG2SIZE depends on cache line size
Diffstat (limited to 'lib/el3_runtime')
-rw-r--r-- | lib/el3_runtime/aarch32/cpu_data.S | 4 | ||||
-rw-r--r-- | lib/el3_runtime/aarch64/cpu_data.S | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/el3_runtime/aarch32/cpu_data.S b/lib/el3_runtime/aarch32/cpu_data.S index 3d6b806997..68d64151fc 100644 --- a/lib/el3_runtime/aarch32/cpu_data.S +++ b/lib/el3_runtime/aarch32/cpu_data.S @@ -34,7 +34,9 @@ endfunc _cpu_data * ----------------------------------------------------------------- */ func _cpu_data_by_index + mov_imm r1, CPU_DATA_SIZE + mul r0, r0, r1 ldr r1, =percpu_data - add r0, r1, r0, LSL #CPU_DATA_LOG2SIZE + add r0, r0, r1 bx lr endfunc _cpu_data_by_index diff --git a/lib/el3_runtime/aarch64/cpu_data.S b/lib/el3_runtime/aarch64/cpu_data.S index de488160b6..96be0813cf 100644 --- a/lib/el3_runtime/aarch64/cpu_data.S +++ b/lib/el3_runtime/aarch64/cpu_data.S @@ -39,7 +39,9 @@ endfunc init_cpu_data_ptr * ----------------------------------------------------------------- */ func _cpu_data_by_index + mov_imm x1, CPU_DATA_SIZE + mul x0, x0, x1 adr x1, percpu_data - add x0, x1, x0, LSL #CPU_DATA_LOG2SIZE + add x0, x0, x1 ret endfunc _cpu_data_by_index |