Commit 65360b91 authored Mar 10, 2015 by Ard Biesheuvel Committed by Sami Tolvanen Nov 22, 2016

BACKPORT: 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>

Bug: 31432001
Change-Id: Ib9f583ca5a31b92a0ff0b3bd74fc39da3e35b870
(cherry picked from commit b1c98297fe0c6e2899ede03fc3b831f36e19fb76)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>

parent 17a7d484

arch/arm64/kernel/head.S

+1 −4

Original line number	Diff line number	Diff line
		@@ -573,10 +573,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