Commit 510224c2 authored Jan 09, 2017 by Mark Rutland Committed by Will Deacon Jan 10, 2017

arm64: head.S: fix up stale comments



In commit 23c8a500 ("arm64: kernel: use ordinary return/argument
register for el2_setup()"), we stopped using w20 as a global stash of
the boot mode flag, and instead pass this around in w0 as a function
parameter.

Unfortunately, we missed a couple of comments, which still refer to the
old convention of using w20/x20.

This patch fixes up the comments to describe the code as it currently
works.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 117f5727

arch/arm64/kernel/head.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -483,7 +483,7 @@ ENTRY(kimage_vaddr)
		* If we're fortunate enough to boot at EL2, ensure that the world is
		* sane before dropping to EL1.
		*
		* Returns either BOOT_CPU_MODE_EL1 or BOOT_CPU_MODE_EL2 in x20 if
		* Returns either BOOT_CPU_MODE_EL1 or BOOT_CPU_MODE_EL2 in w0 if
		* booted in EL1 or EL2 respectively.
		*/
		ENTRY(el2_setup)
		@@ -628,7 +628,7 @@ ENDPROC(el2_setup)

		/*
		* Sets the __boot_cpu_mode flag depending on the CPU boot mode passed
		* in x20. See arch/arm64/include/asm/virt.h for more info.
		* in w0. See arch/arm64/include/asm/virt.h for more info.
		*/
		set_cpu_boot_mode_flag:
		adr_l x1, __boot_cpu_mode

Admin message