Commit 1f667c69 authored Jan 19, 2010 by Tony Lindgren Committed by Russell King Jan 19, 2010

ARM: 5886/1: arm: Fix cpu_proc_fin() for proc-v7.S and make kexec work



The comments in arm_machine_restart() suggest that cpu_proc_fin()
will clean and disable cache and turn off interrupts. This does
not seem to be implemented for proc-v7.S, implement it the same
way as for proc-v6.S.

This also makes kexec work for v7. Note that a related TLB and
branch traget flush patch is also needed to avoid kexec
"crc error".

Note that there are still some issues that seem to be related
to L2 cache being on and causing occasional uncompress "crc error"
with kexec. Anyways, this gets kexec mostly working on V7 for now.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent ad3e6c0b

arch/arm/mm/proc-v7.S

+8 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,14 @@ ENTRY(cpu_v7_proc_init)
		ENDPROC(cpu_v7_proc_init)

		ENTRY(cpu_v7_proc_fin)
		mov pc, lr
		stmfd sp!, {lr}
		cpsid if @ disable interrupts
		bl v7_flush_kern_cache_all
		mrc p15, 0, r0, c1, c0, 0 @ ctrl register
		bic r0, r0, #0x1000 @ ...i............
		bic r0, r0, #0x0006 @ .............ca.
		mcr p15, 0, r0, c1, c0, 0 @ disable caches
		ldmfd sp!, {pc}
		ENDPROC(cpu_v7_proc_fin)

		/*

Admin message