[PATCH] xen/arm64: head: Mark the end of subroutines with ENDPROC (take two)

Julien Grall posted 1 patch 2 years, 2 months ago
Test gitlab-ci passed
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20220228100826.61339-1-julien@xen.org
xen/arch/arm/arm64/head.S | 3 +++
1 file changed, 3 insertions(+)
[PATCH] xen/arm64: head: Mark the end of subroutines with ENDPROC (take two)
Posted by Julien Grall 2 years, 2 months ago
From: Julien Grall <jgrall@amazon.com>

Commit 13c03002c5df ("xen/arm64: head: Mark the end of subroutines
with ENDPROC") intended to mark all the subroutines with ENDPROC.

Unfortunately, I missed fail(), switch_ttbr() and init_uart(). Add
ENDPROC for the benefits of static analysis tools and the reader.

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 xen/arch/arm/arm64/head.S | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 314b800b3f8e..66d862fc8137 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -800,6 +800,7 @@ ENDPROC(launch)
 fail:   PRINT("- Boot failed -\r\n")
 1:      wfe
         b     1b
+ENDPROC(fail)
 
 GLOBAL(_end_boot)
 
@@ -830,6 +831,7 @@ ENTRY(switch_ttbr)
         isb
 
         ret
+ENDPROC(switch_ttbr)
 
 #ifdef CONFIG_EARLY_PRINTK
 /*
@@ -847,6 +849,7 @@ init_uart:
 #endif
         PRINT("- UART enabled -\r\n")
         ret
+ENDPROC(init_uart)
 
 /* Print early debug messages.
  * x0: Nul-terminated string to print.
-- 
2.32.0
Re: [PATCH] xen/arm64: head: Mark the end of subroutines with ENDPROC (take two)
Posted by Julien Grall 2 years, 2 months ago
On 28/02/2022 10:08, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> Commit 13c03002c5df ("xen/arm64: head: Mark the end of subroutines
> with ENDPROC") intended to mark all the subroutines with ENDPROC.
> 
> Unfortunately, I missed fail(), switch_ttbr() and init_uart(). Add
> ENDPROC for the benefits of static analysis tools and the reader.
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Hmmm... It looks like I sent this patch twice. Please ignore this 
version and instead review:

https://lore.kernel.org/xen-devel/20220228100805.60918-1-julien@xen.org/

> ---
>   xen/arch/arm/arm64/head.S | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
> index 314b800b3f8e..66d862fc8137 100644
> --- a/xen/arch/arm/arm64/head.S
> +++ b/xen/arch/arm/arm64/head.S
> @@ -800,6 +800,7 @@ ENDPROC(launch)
>   fail:   PRINT("- Boot failed -\r\n")
>   1:      wfe
>           b     1b
> +ENDPROC(fail)
>   
>   GLOBAL(_end_boot)
>   
> @@ -830,6 +831,7 @@ ENTRY(switch_ttbr)
>           isb
>   
>           ret
> +ENDPROC(switch_ttbr)
>   
>   #ifdef CONFIG_EARLY_PRINTK
>   /*
> @@ -847,6 +849,7 @@ init_uart:
>   #endif
>           PRINT("- UART enabled -\r\n")
>           ret
> +ENDPROC(init_uart)
>   
>   /* Print early debug messages.
>    * x0: Nul-terminated string to print.

-- 
Julien Grall