diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-03-10 15:00:03 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-03-19 19:46:01 +0000 |
| commit | b1c98297fe0c6e2899ede03fc3b831f36e19fb76 (patch) | |
| tree | 4ef6aa4aab154aecb9fc55ae0c13388569d3133d /arch/arm64 | |
| parent | a871d354f795c4960543fb44c9b59af63367d6cf (diff) | |
| download | op-kernel-dev-b1c98297fe0c6e2899ede03fc3b831f36e19fb76.zip op-kernel-dev-b1c98297fe0c6e2899ede03fc3b831f36e19fb76.tar.gz | |
arm64: use PC-relative reference for secondary_holding_pen_release
Replace the confusing virtual/physical address arithmetic with a simple
PC-relative reference.
Tested-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/head.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 42ff109..8182131 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -564,10 +564,6 @@ ENTRY(__boot_cpu_mode) .popsection #ifdef CONFIG_SMP - .align 3 -1: .quad . - .quad secondary_holding_pen_release - /* * This provides a "holding pen" for platforms to hold all secondary * cores are held until we're ready for them to initialise. @@ -579,10 +575,7 @@ ENTRY(secondary_holding_pen) mrs x0, mpidr_el1 ldr x1, =MPIDR_HWID_BITMASK and x0, x0, x1 - adr x1, 1b - ldp x2, x3, [x1] - sub x1, x1, x2 - add x3, x3, x1 + adr_l x3, secondary_holding_pen_release pen: ldr x4, [x3] cmp x4, x0 b.eq secondary_startup |
