[PATCH] ARM: Drop unused marcros in exceptions.S

[PATCH] ARM: Drop unused marcros in exceptions.S

[Andrey Smirnov]

Those macrs looks like a leftover from the time Barebox had some code
to deal with IRQs. That code is gone and there are no users for those
marcros in the codebase anymore. Drop them.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/cpu/exceptions.S | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/arch/arm/cpu/exceptions.S b/arch/arm/cpu/exceptions.S
index eda0d6ab8..55014c8d4 100644
--- a/arch/arm/cpu/exceptions.S
+++ b/arch/arm/cpu/exceptions.S
@@ -55,26 +55,6 @@
 	mov	r0, sp
 	.endm

-	.macro	irq_save_user_regs
-	sub	sp, sp, #S_FRAME_SIZE
-	stmia	sp, {r0 - r12}			@ Calling r0-r12
-	add     r8, sp, #S_PC
-	stmdb   r8, {sp, lr}^                   @ Calling SP, LR
-	str     lr, [r8, #0]                    @ Save calling PC
-	mrs     r6, spsr
-	str     r6, [r8, #4]                    @ Save CPSR
-	str     r0, [r8, #8]                    @ Save OLD_R0
-	mov	r0, sp
-	.endm
-
-	.macro	irq_restore_user_regs
-	ldmia	sp, {r0 - lr}^			@ Calling r0 - lr
-	mov	r0, r0
-	ldr	lr, [sp, #S_PC]			@ Get PC
-	add	sp, sp, #S_FRAME_SIZE
-	subs	pc, lr, #4			@ return & move spsr_svc into cpsr
-	.endm
-
 	.macro get_bad_stack
 	ldr	r13, =abort_stack
 	str	lr, [r13]			@ save caller lr / spsr
@@ -103,14 +83,6 @@
 do_abort_\@:
 	.endm

-	.macro get_irq_stack			@ setup IRQ stack
-	ldr	sp, IRQ_STACK_START
-	.endm
-
-	.macro get_fiq_stack			@ setup FIQ stack
-	ldr	sp, FIQ_STACK_START
-	.endm
-
 /*
  * exception handlers
  */
--
2.21.0

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: Drop unused marcros in exceptions.S

[Sascha Hauer]

On Tue, Mar 31, 2020 at 10:16:32AM -0700, Andrey Smirnov wrote:
> Those macrs looks like a leftover from the time Barebox had some code
> to deal with IRQs. That code is gone and there are no users for those
> marcros in the codebase anymore. Drop them.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>  arch/arm/cpu/exceptions.S | 28 ----------------------------
>  1 file changed, 28 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/cpu/exceptions.S b/arch/arm/cpu/exceptions.S
> index eda0d6ab8..55014c8d4 100644
> --- a/arch/arm/cpu/exceptions.S
> +++ b/arch/arm/cpu/exceptions.S
> @@ -55,26 +55,6 @@
>  	mov	r0, sp
>  	.endm
> 
> -	.macro	irq_save_user_regs
> -	sub	sp, sp, #S_FRAME_SIZE
> -	stmia	sp, {r0 - r12}			@ Calling r0-r12
> -	add     r8, sp, #S_PC
> -	stmdb   r8, {sp, lr}^                   @ Calling SP, LR
> -	str     lr, [r8, #0]                    @ Save calling PC
> -	mrs     r6, spsr
> -	str     r6, [r8, #4]                    @ Save CPSR
> -	str     r0, [r8, #8]                    @ Save OLD_R0
> -	mov	r0, sp
> -	.endm
> -
> -	.macro	irq_restore_user_regs
> -	ldmia	sp, {r0 - lr}^			@ Calling r0 - lr
> -	mov	r0, r0
> -	ldr	lr, [sp, #S_PC]			@ Get PC
> -	add	sp, sp, #S_FRAME_SIZE
> -	subs	pc, lr, #4			@ return & move spsr_svc into cpsr
> -	.endm
> -
>  	.macro get_bad_stack
>  	ldr	r13, =abort_stack
>  	str	lr, [r13]			@ save caller lr / spsr
> @@ -103,14 +83,6 @@
>  do_abort_\@:
>  	.endm
> 
> -	.macro get_irq_stack			@ setup IRQ stack
> -	ldr	sp, IRQ_STACK_START
> -	.endm
> -
> -	.macro get_fiq_stack			@ setup FIQ stack
> -	ldr	sp, FIQ_STACK_START
> -	.endm
> -
>  /*
>   * exception handlers
>   */
> --
> 2.21.0
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox