[PATCH] arm64: entry: remove test_irqs_unmasked macro

[PATCH] arm64: entry: remove test_irqs_unmasked macro

[Mark Rutland]

We haven't needed the test_irqs_unmasked macro since commit:

  105fc3352077bba5 ("arm64: entry: move el1 irq/nmi logic to C")

... and as we convert more of the entry logic to C it is decreasingly
likely we'll need it in future, so let's remove the unused macro.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
---
 arch/arm64/kernel/entry.S | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index a31a0a713c85..a82af88e8599 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -499,20 +499,6 @@ tsk	.req	x28		// current thread_info
 	irq_stack_exit
 	.endm
 
-#ifdef CONFIG_ARM64_PSEUDO_NMI
-	/*
-	 * Set res to 0 if irqs were unmasked in interrupted context.
-	 * Otherwise set res to non-0 value.
-	 */
-	.macro	test_irqs_unmasked res:req, pmr:req
-alternative_if ARM64_HAS_IRQ_PRIO_MASKING
-	sub	\res, \pmr, #GIC_PRIO_IRQON
-alternative_else
-	mov	\res, xzr
-alternative_endif
-	.endm
-#endif
-
 	.macro	gic_prio_kentry_setup, tmp:req
 #ifdef CONFIG_ARM64_PSEUDO_NMI
 	alternative_if ARM64_HAS_IRQ_PRIO_MASKING
-- 
2.11.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: entry: remove test_irqs_unmasked macro

[Marc Zyngier]

On Tue, 23 Mar 2021 18:12:01 +0000,
Mark Rutland <mark.rutland@arm.com> wrote:
> 
> We haven't needed the test_irqs_unmasked macro since commit:
> 
>   105fc3352077bba5 ("arm64: entry: move el1 irq/nmi logic to C")
> 
> ... and as we convert more of the entry logic to C it is decreasingly
> likely we'll need it in future, so let's remove the unused macro.
> 
> There should be no functional change as a result of this patch.
> 
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin marinas <catalin.marinas@arm.com>
> Cc: James Morse <james.morse@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Will Deacon <will@kernel.org>

Acked-by: Marc Zyngier <maz@kernel.org>

	M.

-- 
Without deviation from the norm, progress is not possible.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: entry: remove test_irqs_unmasked macro

[Will Deacon]

On Tue, Mar 23, 2021 at 06:12:01PM +0000, Mark Rutland wrote:
> We haven't needed the test_irqs_unmasked macro since commit:
> 
>   105fc3352077bba5 ("arm64: entry: move el1 irq/nmi logic to C")
> 
> ... and as we convert more of the entry logic to C it is decreasingly
> likely we'll need it in future, so let's remove the unused macro.
> 
> There should be no functional change as a result of this patch.
> 
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin marinas <catalin.marinas@arm.com>
> Cc: James Morse <james.morse@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Will Deacon <will@kernel.org>
> ---
>  arch/arm64/kernel/entry.S | 14 --------------
>  1 file changed, 14 deletions(-)

Acked-by: Will Deacon <will@kernel.org>

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: entry: remove test_irqs_unmasked macro

[Catalin Marinas]

On Tue, 23 Mar 2021 18:12:01 +0000, Mark Rutland wrote:
> We haven't needed the test_irqs_unmasked macro since commit:
> 
>   105fc3352077bba5 ("arm64: entry: move el1 irq/nmi logic to C")
> 
> ... and as we convert more of the entry logic to C it is decreasingly
> likely we'll need it in future, so let's remove the unused macro.
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: entry: remove test_irqs_unmasked macro
      https://git.kernel.org/arm64/c/9eef29d8c31b

-- 
Catalin


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel