* [PATCH v2] arm64: xen: Use modern annotations for assembly functions
@ 2019-12-19 12:25 Mark Brown
2019-12-19 21:07 ` Stefano Stabellini
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2019-12-19 12:25 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: xen-devel, Mark Brown, Julien Grall, Stefano Stabellini,
linux-arm-kernel
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>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
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..5b09aca55108 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);
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] arm64: xen: Use modern annotations for assembly functions
2019-12-19 12:25 [PATCH v2] arm64: xen: Use modern annotations for assembly functions Mark Brown
@ 2019-12-19 21:07 ` Stefano Stabellini
2020-01-08 15:55 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Stefano Stabellini @ 2019-12-19 21:07 UTC (permalink / raw)
To: Mark Brown
Cc: Stefano Stabellini, Julien Grall, Catalin Marinas, xen-devel,
Will Deacon, linux-arm-kernel
On Thu, 19 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>
> Reviewed-by: Julien Grall <julien@xen.org>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Thank you!
> ---
> 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..5b09aca55108 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);
> --
> 2.20.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] arm64: xen: Use modern annotations for assembly functions
2019-12-19 21:07 ` Stefano Stabellini
@ 2020-01-08 15:55 ` Will Deacon
2020-01-09 15:58 ` Catalin Marinas
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2020-01-08 15:55 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Catalin Marinas, Mark Brown, Julien Grall, linux-arm-kernel,
xen-devel
On Thu, Dec 19, 2019 at 01:07:50PM -0800, Stefano Stabellini wrote:
> On Thu, 19 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>
> > Reviewed-by: Julien Grall <julien@xen.org>
> > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
>
> Thank you!
>
> > ---
> > arch/arm64/xen/hypercall.S | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
Is this going via the Xen tree, or shall I queue it along with the other
asm annotation patches in the arm64 tree? I don't see it in -next yet.
Cheers,
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] arm64: xen: Use modern annotations for assembly functions
2020-01-08 15:55 ` Will Deacon
@ 2020-01-09 15:58 ` Catalin Marinas
2020-01-09 16:33 ` Stefano Stabellini
0 siblings, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2020-01-09 15:58 UTC (permalink / raw)
To: Will Deacon
Cc: xen-devel, Mark Brown, Stefano Stabellini, Julien Grall,
linux-arm-kernel
On Wed, Jan 08, 2020 at 03:55:52PM +0000, Will Deacon wrote:
> On Thu, Dec 19, 2019 at 01:07:50PM -0800, Stefano Stabellini wrote:
> > On Thu, 19 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>
> > > Reviewed-by: Julien Grall <julien@xen.org>
> > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> >
> > Thank you!
> >
> > > ---
> > > arch/arm64/xen/hypercall.S | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Is this going via the Xen tree, or shall I queue it along with the other
> asm annotation patches in the arm64 tree? I don't see it in -next yet.
Since it has been reviewed by the Xen maintainers, just queue it via the
arm64 tree.
--
Catalin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] arm64: xen: Use modern annotations for assembly functions
2020-01-09 15:58 ` Catalin Marinas
@ 2020-01-09 16:33 ` Stefano Stabellini
2020-01-09 16:35 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Stefano Stabellini @ 2020-01-09 16:33 UTC (permalink / raw)
To: Catalin Marinas
Cc: Stefano Stabellini, Julien Grall, Mark Brown, xen-devel,
Will Deacon, linux-arm-kernel
On Thu, 9 Jan 2020, Catalin Marinas wrote:
> On Wed, Jan 08, 2020 at 03:55:52PM +0000, Will Deacon wrote:
> > On Thu, Dec 19, 2019 at 01:07:50PM -0800, Stefano Stabellini wrote:
> > > On Thu, 19 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>
> > > > Reviewed-by: Julien Grall <julien@xen.org>
> > > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> > >
> > > Thank you!
> > >
> > > > ---
> > > > arch/arm64/xen/hypercall.S | 8 ++++----
> > > > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > Is this going via the Xen tree, or shall I queue it along with the other
> > asm annotation patches in the arm64 tree? I don't see it in -next yet.
>
> Since it has been reviewed by the Xen maintainers, just queue it via the
> arm64 tree.
Yes, that's fine by me
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] arm64: xen: Use modern annotations for assembly functions
2020-01-09 16:33 ` Stefano Stabellini
@ 2020-01-09 16:35 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2020-01-09 16:35 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Catalin Marinas, Mark Brown, Julien Grall, linux-arm-kernel,
xen-devel
On Thu, Jan 09, 2020 at 08:33:37AM -0800, Stefano Stabellini wrote:
> On Thu, 9 Jan 2020, Catalin Marinas wrote:
> > On Wed, Jan 08, 2020 at 03:55:52PM +0000, Will Deacon wrote:
> > > On Thu, Dec 19, 2019 at 01:07:50PM -0800, Stefano Stabellini wrote:
> > > > On Thu, 19 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>
> > > > > Reviewed-by: Julien Grall <julien@xen.org>
> > > > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> > > >
> > > > Thank you!
> > > >
> > > > > ---
> > > > > arch/arm64/xen/hypercall.S | 8 ++++----
> > > > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > Is this going via the Xen tree, or shall I queue it along with the other
> > > asm annotation patches in the arm64 tree? I don't see it in -next yet.
> >
> > Since it has been reviewed by the Xen maintainers, just queue it via the
> > arm64 tree.
>
> Yes, that's fine by me
Done. Will update the branch tomorrow.
Cheers,
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-09 16:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-19 12:25 [PATCH v2] arm64: xen: Use modern annotations for assembly functions Mark Brown
2019-12-19 21:07 ` Stefano Stabellini
2020-01-08 15:55 ` Will Deacon
2020-01-09 15:58 ` Catalin Marinas
2020-01-09 16:33 ` Stefano Stabellini
2020-01-09 16:35 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox