* [PATCH] arm64: head.S: fix up stale comments
@ 2017-01-09 14:31 Mark Rutland
2017-01-09 14:55 ` Ard Biesheuvel
2017-01-10 12:37 ` Will Deacon
0 siblings, 2 replies; 4+ messages in thread
From: Mark Rutland @ 2017-01-09 14:31 UTC (permalink / raw)
To: linux-arm-kernel
In commit 23c8a500c24d02dd ("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>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/kernel/head.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 4b1abac..9b0857a 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] arm64: head.S: fix up stale comments
2017-01-09 14:31 [PATCH] arm64: head.S: fix up stale comments Mark Rutland
@ 2017-01-09 14:55 ` Ard Biesheuvel
2017-01-09 14:56 ` Mark Rutland
2017-01-10 12:37 ` Will Deacon
1 sibling, 1 reply; 4+ messages in thread
From: Ard Biesheuvel @ 2017-01-09 14:55 UTC (permalink / raw)
To: linux-arm-kernel
On 9 January 2017 at 14:31, Mark Rutland <mark.rutland@arm.com> wrote:
> In commit 23c8a500c24d02dd ("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.
>
Ah yes, apologies for the sloppiness
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm64/kernel/head.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> index 4b1abac..9b0857a 100644
> --- a/arch/arm64/kernel/head.S
> +++ b/arch/arm64/kernel/head.S
> @@ -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
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] arm64: head.S: fix up stale comments
2017-01-09 14:55 ` Ard Biesheuvel
@ 2017-01-09 14:56 ` Mark Rutland
0 siblings, 0 replies; 4+ messages in thread
From: Mark Rutland @ 2017-01-09 14:56 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 09, 2017 at 02:55:51PM +0000, Ard Biesheuvel wrote:
> On 9 January 2017 at 14:31, Mark Rutland <mark.rutland@arm.com> wrote:
> > In commit 23c8a500c24d02dd ("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.
> >
>
> Ah yes, apologies for the sloppiness
No worries; I missed this in review, too...
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cheers!
Mark.
> > Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Will Deacon <will.deacon@arm.com>
> > ---
> > arch/arm64/kernel/head.S | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> > index 4b1abac..9b0857a 100644
> > --- a/arch/arm64/kernel/head.S
> > +++ b/arch/arm64/kernel/head.S
> > @@ -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
> > --
> > 1.9.1
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] arm64: head.S: fix up stale comments
2017-01-09 14:31 [PATCH] arm64: head.S: fix up stale comments Mark Rutland
2017-01-09 14:55 ` Ard Biesheuvel
@ 2017-01-10 12:37 ` Will Deacon
1 sibling, 0 replies; 4+ messages in thread
From: Will Deacon @ 2017-01-10 12:37 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 09, 2017 at 02:31:55PM +0000, Mark Rutland wrote:
> In commit 23c8a500c24d02dd ("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>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm64/kernel/head.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied for 4.11 with Ard's ack.
Will
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-10 12:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 14:31 [PATCH] arm64: head.S: fix up stale comments Mark Rutland
2017-01-09 14:55 ` Ard Biesheuvel
2017-01-09 14:56 ` Mark Rutland
2017-01-10 12:37 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).