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

Commit 041f777c authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 



Convert the SMP msm platforms to be using the gic_handle_irq
function as their primary interrupt handler.

Tested-by: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent abd3ca51

arch/arm/mach-msm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config ARCH_MSM8X60 
	select GPIO_MSM_V2

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select MULTI_IRQ_HANDLER



config ARCH_MSM8960

	bool "MSM8960"
@@ -60,6 +61,7 @@ config ARCH_MSM8960 
	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select MULTI_IRQ_HANDLER



endchoice

arch/arm/mach-msm/board-msm8960.c

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR") 
	.map_io = msm8960_map_io,

	.init_irq = msm8960_init_irq,

	.timer = &msm_timer,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8960_sim_init,

MACHINE_END
@@ -108,6 +109,7 @@ MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3") 
	.map_io = msm8960_map_io,

	.init_irq = msm8960_init_irq,

	.timer = &msm_timer,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8960_rumi3_init,

MACHINE_END

arch/arm/mach-msm/board-msm8x60.c

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3") 
	.reserve = msm8x60_reserve,

	.map_io = msm8x60_map_io,

	.init_irq = msm8x60_init_irq,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

MACHINE_END
@@ -117,6 +118,7 @@ MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF") 
	.reserve = msm8x60_reserve,

	.map_io = msm8x60_map_io,

	.init_irq = msm8x60_init_irq,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

MACHINE_END
@@ -126,6 +128,7 @@ MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR") 
	.reserve = msm8x60_reserve,

	.map_io = msm8x60_map_io,

	.init_irq = msm8x60_init_irq,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

MACHINE_END
@@ -135,6 +138,7 @@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA") 
	.reserve = msm8x60_reserve,

	.map_io = msm8x60_map_io,

	.init_irq = msm8x60_init_irq,

	.handle_irq = gic_handle_irq,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

MACHINE_END

arch/arm/mach-msm/include/mach/entry-macro-qgic.S

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Low-level IRQ helper macros

 *

 * Copyright (c) 2010, Code Aurora Forum. All rights reserved.

 *

 * This file is licensed under  the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



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



	.macro	disable_fiq

	.endm



	.macro  arch_ret_to_user, tmp1, tmp2

	.endm

arch/arm/mach-msm/include/mach/entry-macro-vic.S

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

 * Author: Brian Swetland <swetland@google.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <mach/msm_iomap.h>



	.macro	disable_fiq

	.endm



	.macro	get_irqnr_preamble, base, tmp

	@ enable imprecise aborts

	cpsie	a

	mov	\base, #MSM_VIC_BASE

	.endm



	.macro	arch_ret_to_user, tmp1, tmp2

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	@ 0xD0 has irq# or old irq# if the irq has been handled

	@ 0xD4 has irq# or -1 if none pending *but* if you just

	@ read 0xD4 you never get the first irq for some reason

	ldr	\irqnr, [\base, #0xD0]

	ldr	\irqnr, [\base, #0xD4]

	cmp	\irqnr, #0xffffffff

	.endm