From: Julien Grall <jgrall@amazon.com>

Commit 2ac705a59ef5 ("xen/arm32: head: Mark the end of subroutines
with ENDPROC") intended to mark all the subroutines with ENDPROC.

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

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

diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index b1d209ea2842..13cfc837d39c 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -661,6 +661,7 @@ ENDPROC(launch)
 fail:   PRINT("- Boot failed -\r\n")
 1:      wfe
         b     1b
+ENDPROC(fail)
 
 GLOBAL(_end_boot)
 
@@ -694,6 +695,7 @@ ENTRY(switch_ttbr)
         isb
 
         mov pc, lr
+ENDPROC(switch_ttbr)
 
 #ifdef CONFIG_EARLY_PRINTK
 /*
@@ -711,6 +713,7 @@ init_uart:
 #endif
         PRINT("- UART enabled -\r\n")
         mov   pc, lr
+ENDPROC(init_uart)
 
 /*
  * Print early debug messages.
@@ -798,6 +801,7 @@ __lookup_processor_type:
         mov   r1, #0
 2:
         mov   pc, lr
+ENDPROC(__lookup_processor_type)
 
 /*
  * Local variables:
-- 
2.32.0

Hi Julien,

> On 28 Feb 2022, at 10:07, Julien Grall <julien@xen.org> wrote:
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Commit 2ac705a59ef5 ("xen/arm32: head: Mark the end of subroutines
> with ENDPROC") intended to mark all the subroutines with ENDPROC.
> 
> Unfortunately, I missed fail(), switch_ttbr(), init_uart() and
> __lookup_processor_type(). Add ENDPROC for the benefits of
> static analysis tools and the reader.
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> ---
> xen/arch/arm/arm32/head.S | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
> index b1d209ea2842..13cfc837d39c 100644
> --- a/xen/arch/arm/arm32/head.S
> +++ b/xen/arch/arm/arm32/head.S
> @@ -661,6 +661,7 @@ ENDPROC(launch)
> fail:   PRINT("- Boot failed -\r\n")
> 1:      wfe
>         b     1b
> +ENDPROC(fail)
> 
> GLOBAL(_end_boot)
> 
> @@ -694,6 +695,7 @@ ENTRY(switch_ttbr)
>         isb
> 
>         mov pc, lr
> +ENDPROC(switch_ttbr)
> 
> #ifdef CONFIG_EARLY_PRINTK
> /*
> @@ -711,6 +713,7 @@ init_uart:
> #endif
>         PRINT("- UART enabled -\r\n")
>         mov   pc, lr
> +ENDPROC(init_uart)
> 
> /*
>  * Print early debug messages.
> @@ -798,6 +801,7 @@ __lookup_processor_type:
>         mov   r1, #0
> 2:
>         mov   pc, lr
> +ENDPROC(__lookup_processor_type)
> 
> /*
>  * Local variables:
> -- 
> 2.32.0
> 

Hi Julien,

On 28.02.2022 11:07, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> Commit 2ac705a59ef5 ("xen/arm32: head: Mark the end of subroutines
> with ENDPROC") intended to mark all the subroutines with ENDPROC.
> 
> Unfortunately, I missed fail(), switch_ttbr(), init_uart() and
> __lookup_processor_type(). Add ENDPROC for the benefits of
> static analysis tools and the reader.
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> ---

I checked and it seems like you covered them all now.

Reviewed-by: Michal Orzel <michal.orzel@arm.com>

Cheers,
Michal