Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7627dc80 authored by Russell King's avatar Russell King
Browse files

ARM: GIC: private a standard get_irqnr_preamble assembler macro 



Provide a standard get_irqnr_preamble assembler macro for platforms
to use, which retrieves the base address of the GIC CPU interface
from gic_cpu_base_addr.  Allow platforms to override this by defining
HAVE_GET_IRQNR_PREAMBLE.

Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bef8f9ee

arch/arm/include/asm/hardware/entry-macro-gic.S

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,13 @@ 


#include <asm/hardware/gic.h>



#ifndef HAVE_GET_IRQNR_PREAMBLE

	.macro	get_irqnr_preamble, base, tmp

	ldr	\base, =gic_cpu_base_addr

	ldr	\base, [\base]

	.endm

#endif



/*

 * The interrupt numbering scheme is defined in the

 * interrupt controller spec.  To wit:

arch/arm/mach-cns3xxx/include/mach/entry-macro.S

+0 −5
Original line number Diff line number Diff line
@@ -14,10 +14,5 @@ 
		.macro	disable_fiq

		.endm



		.macro  get_irqnr_preamble, base, tmp

		ldr	\base, =gic_cpu_base_addr

		ldr	\base, [\base]

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm

arch/arm/mach-omap2/include/mach/entry-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ omap_irq_base: .word 0 




#ifdef CONFIG_ARCH_OMAP4

#define HAVE_GET_IRQNR_PREAMBLE

#include <asm/hardware/entry-macro-gic.S>



		.macro  get_irqnr_preamble, base, tmp

arch/arm/mach-realview/include/mach/entry-macro.S

+0 −5
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
		.macro	disable_fiq

		.endm



		.macro  get_irqnr_preamble, base, tmp

		ldr	\base, =gic_cpu_base_addr

		ldr	\base, [\base]

		.endm



		.macro  arch_ret_to_user, tmp1, tmp2

		.endm

arch/arm/mach-tegra/include/mach/entry-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <mach/io.h>



#if defined(CONFIG_ARM_GIC)



#define HAVE_GET_IRQNR_PREAMBLE

#include <asm/hardware/entry-macro-gic.S>



	/* Uses the GIC interrupt controller built into the cpu */