[Xen-devel] arm64: xen: Use modern annotations for assembly functions

Message ID 20191218123756.41363-1-broonie@kernel.org
State Superseded
Headers show
Series
  • [Xen-devel] arm64: xen: Use modern annotations for assembly functions
Related show

Commit Message

Mark Brown Dec. 18, 2019, 12:37 p.m.
In an effort to clarify and simplify the annotation of assembly functions
in the kernel new macros have been introduced. These replace ENTRY and
ENDPROC. Update the annotations in the xen code to the new macros.

Signed-off-by: Mark Brown <broonie@kernel.org>
---

This is part of a wider effort to convert all the arch/arm64 code.

 arch/arm64/xen/hypercall.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Julien Grall Dec. 18, 2019, 1:42 p.m. | #1
On 18/12/2019 12:37, Mark Brown wrote:
> In an effort to clarify and simplify the annotation of assembly functions
> in the kernel new macros have been introduced. These replace ENTRY and
> ENDPROC. Update the annotations in the xen code to the new macros.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>

Reviewed-by: Julien Grall <julien@xen.org>

Cheers,

> ---
> 
> This is part of a wider effort to convert all the arch/arm64 code.
> 
>   arch/arm64/xen/hypercall.S | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
> index c5f05c4a4d00..305c2274b8eb 100644
> --- a/arch/arm64/xen/hypercall.S
> +++ b/arch/arm64/xen/hypercall.S
> @@ -56,11 +56,11 @@
>   #define XEN_IMM 0xEA1
>   
>   #define HYPERCALL_SIMPLE(hypercall)		\
> -ENTRY(HYPERVISOR_##hypercall)			\
> +SYM_FUNC_START(HYPERVISOR_##hypercall)			\
>   	mov x16, #__HYPERVISOR_##hypercall;	\
>   	hvc XEN_IMM;				\
>   	ret;					\
> -ENDPROC(HYPERVISOR_##hypercall)
> +SYM_FUNC_END(HYPERVISOR_##hypercall)
>   
>   #define HYPERCALL0 HYPERCALL_SIMPLE
>   #define HYPERCALL1 HYPERCALL_SIMPLE
> @@ -86,7 +86,7 @@ HYPERCALL2(multicall);
>   HYPERCALL2(vm_assist);
>   HYPERCALL3(dm_op);
>   
> -ENTRY(privcmd_call)
> +SYM_FUNC_START(privcmd_call)
>   	mov x16, x0
>   	mov x0, x1
>   	mov x1, x2
> @@ -109,4 +109,4 @@ ENTRY(privcmd_call)
>   	 */
>   	uaccess_ttbr0_disable x6, x7
>   	ret
> -ENDPROC(privcmd_call);
> +SYM_FUNC_END(privcmd_call);
>
Stefano Stabellini Dec. 18, 2019, 11:40 p.m. | #2
On Wed, 18 Dec 2019, Mark Brown wrote:
> In an effort to clarify and simplify the annotation of assembly functions
> in the kernel new macros have been introduced. These replace ENTRY and
> ENDPROC. Update the annotations in the xen code to the new macros.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> 
> This is part of a wider effort to convert all the arch/arm64 code.
> 
>  arch/arm64/xen/hypercall.S | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
> index c5f05c4a4d00..305c2274b8eb 100644
> --- a/arch/arm64/xen/hypercall.S
> +++ b/arch/arm64/xen/hypercall.S
> @@ -56,11 +56,11 @@
>  #define XEN_IMM 0xEA1
>  
>  #define HYPERCALL_SIMPLE(hypercall)		\
> -ENTRY(HYPERVISOR_##hypercall)			\
> +SYM_FUNC_START(HYPERVISOR_##hypercall)			\

Could you please adjust the tabs so that the '\' is aligned with the
others?

With that change:

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


>  	mov x16, #__HYPERVISOR_##hypercall;	\
>  	hvc XEN_IMM;				\
>  	ret;					\
> -ENDPROC(HYPERVISOR_##hypercall)
> +SYM_FUNC_END(HYPERVISOR_##hypercall)
>  
>  #define HYPERCALL0 HYPERCALL_SIMPLE
>  #define HYPERCALL1 HYPERCALL_SIMPLE
> @@ -86,7 +86,7 @@ HYPERCALL2(multicall);
>  HYPERCALL2(vm_assist);
>  HYPERCALL3(dm_op);
>  
> -ENTRY(privcmd_call)
> +SYM_FUNC_START(privcmd_call)
>  	mov x16, x0
>  	mov x0, x1
>  	mov x1, x2
> @@ -109,4 +109,4 @@ ENTRY(privcmd_call)
>  	 */
>  	uaccess_ttbr0_disable x6, x7
>  	ret
> -ENDPROC(privcmd_call);
> +SYM_FUNC_END(privcmd_call);
> -- 
> 2.20.1
>

Patch

diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
index c5f05c4a4d00..305c2274b8eb 100644
--- a/arch/arm64/xen/hypercall.S
+++ b/arch/arm64/xen/hypercall.S
@@ -56,11 +56,11 @@ 
 #define XEN_IMM 0xEA1
 
 #define HYPERCALL_SIMPLE(hypercall)		\
-ENTRY(HYPERVISOR_##hypercall)			\
+SYM_FUNC_START(HYPERVISOR_##hypercall)			\
 	mov x16, #__HYPERVISOR_##hypercall;	\
 	hvc XEN_IMM;				\
 	ret;					\
-ENDPROC(HYPERVISOR_##hypercall)
+SYM_FUNC_END(HYPERVISOR_##hypercall)
 
 #define HYPERCALL0 HYPERCALL_SIMPLE
 #define HYPERCALL1 HYPERCALL_SIMPLE
@@ -86,7 +86,7 @@  HYPERCALL2(multicall);
 HYPERCALL2(vm_assist);
 HYPERCALL3(dm_op);
 
-ENTRY(privcmd_call)
+SYM_FUNC_START(privcmd_call)
 	mov x16, x0
 	mov x0, x1
 	mov x1, x2
@@ -109,4 +109,4 @@  ENTRY(privcmd_call)
 	 */
 	uaccess_ttbr0_disable x6, x7
 	ret
-ENDPROC(privcmd_call);
+SYM_FUNC_END(privcmd_call);