Commit b511a659 authored Jul 31, 2015 by Sudeep Holla Committed by Will Deacon Jul 31, 2015

arm64: restore cpu suspend/resume functionality



Commit 4b3dc967 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
accidentally retained code for !CONFIG_SMP in cpu_resume function. This
resulted in the hash index being zeroed in x7 after proper computation,
which is then used to get the cpu context pointer while resuming.

This patch removes the remanant code and restores back the cpu suspend/
resume functionality.

Fixes: 4b3dc967 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 72407514

arch/arm64/kernel/sleep.S

+0 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,6 @@ ENTRY(cpu_resume)
		ldp w5, w6, [x8, #(MPIDR_HASH_SHIFTS + 8)]
		compute_mpidr_hash x7, x3, x4, x5, x6, x1, x2
		/* x7 contains hash index, let's use it to grab context pointer */
		mov x7, xzr
		ldr_l x0, sleep_save_sp + SLEEP_SAVE_SP_PHYS
		ldr x0, [x0, x7, lsl #3]
		/* load sp from context */

Admin message