michaelh/zephyr
1
0
Fork 0
Code Releases Activity

aarch64: Rename z_arm64_get_cpu_id macro

Browse source 
z_arm64_* prefix should not be used for macros. Rename it.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2021-03-08 15:47:16 +01:00 • committed by Anas Nashif
commit 8388794c9b
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/aarch64/macro_priv.inc
View file

@ -16,7 +16,7 @@ GDATA(_kernel)
* Get CPU id * Get CPU id
*/ */
.macro z_arm64_get_cpu_id xreg0 .macro get_cpu_id xreg0
mrs \xreg0, mpidr_el1 mrs \xreg0, mpidr_el1
/* FIMXME: aff3 not taken into consideration */ /* FIMXME: aff3 not taken into consideration */
ubfx \xreg0, \xreg0, #0, #24 ubfx \xreg0, \xreg0, #0, #24
@ -28,7 +28,7 @@ GDATA(_kernel)
.macro get_cpu xreg0, xreg1 .macro get_cpu xreg0, xreg1
ldr \xreg0, =_curr_cpu ldr \xreg0, =_curr_cpu
z_arm64_get_cpu_id \xreg1 get_cpu_id \xreg1
add \xreg0, \xreg0, \xreg1, lsl #3 add \xreg0, \xreg0, \xreg1, lsl #3
ldr \xreg0, [\xreg0] ldr \xreg0, [\xreg0]
.endm .endm

6
arch/arm/core/aarch64/reset.S
View file

@ -76,7 +76,7 @@ out:
msr SPSel, #0 msr SPSel, #0
#if CONFIG_MP_NUM_CPUS > 1 #if CONFIG_MP_NUM_CPUS > 1
z_arm64_get_cpu_id x0 get_cpu_id x0
cbnz x0, L_secondary_stack cbnz x0, L_secondary_stack
#endif #endif
@ -89,7 +89,7 @@ out:
#if CONFIG_MP_NUM_CPUS > 1 #if CONFIG_MP_NUM_CPUS > 1
L_secondary_stack: L_secondary_stack:
z_arm64_get_cpu_id x1 get_cpu_id x1
adr x0, arm64_cpu_init adr x0, arm64_cpu_init
mov x2, #ARM64_CPU_INIT_SIZE mov x2, #ARM64_CPU_INIT_SIZE
madd x0, x1, x2, x0 madd x0, x1, x2, x0
@ -156,7 +156,7 @@ switch_el:
isb isb
#if CONFIG_MP_NUM_CPUS > 1 #if CONFIG_MP_NUM_CPUS > 1
z_arm64_get_cpu_id x0 get_cpu_id x0
cbnz x0, L_enable_secondary cbnz x0, L_enable_secondary
#endif #endif