All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm64: kernel: Correct annotation of end of el0_sync
@ 2020-01-10 15:50 Mark Brown
  2020-01-10 15:53 ` Mark Brown
  2020-01-10 15:54 ` Mark Rutland
  0 siblings, 2 replies; 4+ messages in thread
From: Mark Brown @ 2020-01-10 15:50 UTC (permalink / raw)
  To: Catalin Marinas, Will Deacon, Mark Rutland; +Cc: Mark Brown, linux-arm-kernel

Commit 582f95835a8fc812c (arm64: entry: convert el0_sync to C) caused the
ENDPROC() annotating the end of el0_sync to be placed after the code for
el0_sync_compat. This replaced the previous annotation where it was
located after all the cases that are now converted to C, including after
the currently unannotated el0_irq_compat and el0_error_compat. Move the
annotation to the end of the function and add separate annotations for the
_compat ones.

Fixes: 582f95835a8fc812c (arm64: entry: convert el0_sync to C)
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/kernel/entry.S | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 7c6a0a41676f..d54d165b286a 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -653,6 +653,7 @@ el0_sync:
 	mov	x0, sp
 	bl	el0_sync_handler
 	b	ret_to_user
+ENDPROC(el0_sync)
 
 #ifdef CONFIG_COMPAT
 	.align	6
@@ -661,16 +662,18 @@ el0_sync_compat:
 	mov	x0, sp
 	bl	el0_sync_compat_handler
 	b	ret_to_user
-ENDPROC(el0_sync)
+ENDPROC(el0_sync_compat)
 
 	.align	6
 el0_irq_compat:
 	kernel_entry 0, 32
 	b	el0_irq_naked
+ENDPROC(el0_irq_compat)
 
 el0_error_compat:
 	kernel_entry 0, 32
 	b	el0_error_naked
+ENDPROC(el0_error_compat)
 #endif
 
 	.align	6
-- 
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] 4+ messages in thread

* Re: [PATCH] arm64: kernel: Correct annotation of end of el0_sync
  2020-01-10 15:50 [PATCH] arm64: kernel: Correct annotation of end of el0_sync Mark Brown
@ 2020-01-10 15:53 ` Mark Brown
  2020-01-10 15:55   ` Mark Rutland
  2020-01-10 15:54 ` Mark Rutland
  1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2020-01-10 15:53 UTC (permalink / raw)
  To: Catalin Marinas, Will Deacon, Mark Rutland; +Cc: linux-arm-kernel


[-- Attachment #1.1: Type: text/plain, Size: 642 bytes --]

On Fri, Jan 10, 2020 at 03:50:04PM +0000, Mark Brown wrote:
> Commit 582f95835a8fc812c (arm64: entry: convert el0_sync to C) caused the
> ENDPROC() annotating the end of el0_sync to be placed after the code for
> el0_sync_compat. This replaced the previous annotation where it was
> located after all the cases that are now converted to C, including after
> the currently unannotated el0_irq_compat and el0_error_compat. Move the
> annotation to the end of the function and add separate annotations for the
> _compat ones.

Sorry, just realized that a variant of this is in the series that Mark
posted earlier this week - please ignore this.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
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] 4+ messages in thread

* Re: [PATCH] arm64: kernel: Correct annotation of end of el0_sync
  2020-01-10 15:50 [PATCH] arm64: kernel: Correct annotation of end of el0_sync Mark Brown
  2020-01-10 15:53 ` Mark Brown
@ 2020-01-10 15:54 ` Mark Rutland
  1 sibling, 0 replies; 4+ messages in thread
From: Mark Rutland @ 2020-01-10 15:54 UTC (permalink / raw)
  To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel

On Fri, Jan 10, 2020 at 03:50:04PM +0000, Mark Brown wrote:
> Commit 582f95835a8fc812c (arm64: entry: convert el0_sync to C) caused the
> ENDPROC() annotating the end of el0_sync to be placed after the code for
> el0_sync_compat. This replaced the previous annotation where it was
> located after all the cases that are now converted to C, including after
> the currently unannotated el0_irq_compat and el0_error_compat. Move the
> annotation to the end of the function and add separate annotations for the
> _compat ones.
> 
> Fixes: 582f95835a8fc812c (arm64: entry: convert el0_sync to C)
> Signed-off-by: Mark Brown <broonie@kernel.org>

Looks sane to me; I can rebase my entry rework atop.

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/kernel/entry.S | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> index 7c6a0a41676f..d54d165b286a 100644
> --- a/arch/arm64/kernel/entry.S
> +++ b/arch/arm64/kernel/entry.S
> @@ -653,6 +653,7 @@ el0_sync:
>  	mov	x0, sp
>  	bl	el0_sync_handler
>  	b	ret_to_user
> +ENDPROC(el0_sync)
>  
>  #ifdef CONFIG_COMPAT
>  	.align	6
> @@ -661,16 +662,18 @@ el0_sync_compat:
>  	mov	x0, sp
>  	bl	el0_sync_compat_handler
>  	b	ret_to_user
> -ENDPROC(el0_sync)
> +ENDPROC(el0_sync_compat)
>  
>  	.align	6
>  el0_irq_compat:
>  	kernel_entry 0, 32
>  	b	el0_irq_naked
> +ENDPROC(el0_irq_compat)
>  
>  el0_error_compat:
>  	kernel_entry 0, 32
>  	b	el0_error_naked
> +ENDPROC(el0_error_compat)
>  #endif
>  
>  	.align	6
> -- 
> 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] 4+ messages in thread

* Re: [PATCH] arm64: kernel: Correct annotation of end of el0_sync
  2020-01-10 15:53 ` Mark Brown
@ 2020-01-10 15:55   ` Mark Rutland
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Rutland @ 2020-01-10 15:55 UTC (permalink / raw)
  To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel

On Fri, Jan 10, 2020 at 03:53:26PM +0000, Mark Brown wrote:
> On Fri, Jan 10, 2020 at 03:50:04PM +0000, Mark Brown wrote:
> > Commit 582f95835a8fc812c (arm64: entry: convert el0_sync to C) caused the
> > ENDPROC() annotating the end of el0_sync to be placed after the code for
> > el0_sync_compat. This replaced the previous annotation where it was
> > located after all the cases that are now converted to C, including after
> > the currently unannotated el0_irq_compat and el0_error_compat. Move the
> > annotation to the end of the function and add separate annotations for the
> > _compat ones.
> 
> Sorry, just realized that a variant of this is in the series that Mark
> posted earlier this week - please ignore this.

I'm happy to rebase my entry rework atop of this patch if it gets queued
now, so I'll leave it to Catalin and Will to choose.

Thanks,
Mark.

_______________________________________________
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] 4+ messages in thread

end of thread, other threads:[~2020-01-10 15:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 15:50 [PATCH] arm64: kernel: Correct annotation of end of el0_sync Mark Brown
2020-01-10 15:53 ` Mark Brown
2020-01-10 15:55   ` Mark Rutland
2020-01-10 15:54 ` Mark Rutland

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.