diff options
Diffstat (limited to 'arch/arm/mach-msm/include/mach/entry-macro.S')
-rw-r--r-- | arch/arm/mach-msm/include/mach/entry-macro.S | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/arch/arm/mach-msm/include/mach/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S index d2259486bcb1..b16f082eeb6f 100644 --- a/arch/arm/mach-msm/include/mach/entry-macro.S +++ b/arch/arm/mach-msm/include/mach/entry-macro.S | |||
@@ -1,38 +1,23 @@ | |||
1 | /* arch/arm/mach-msm7200/include/mach/entry-macro.S | 1 | /* Copyright (c) 2010, Code Aurora Forum. All rights reserved. |
2 | * | 2 | * |
3 | * Copyright (C) 2007 Google, Inc. | 3 | * This program is free software; you can redistribute it and/or modify |
4 | * Author: Brian Swetland <swetland@google.com> | 4 | * it under the terms of the GNU General Public License version 2 and |
5 | * | 5 | * only version 2 as published by the Free Software Foundation. |
6 | * This software is licensed under the terms of the GNU General Public | ||
7 | * License version 2, as published by the Free Software Foundation, and | ||
8 | * may be copied, distributed, and modified under those terms. | ||
9 | * | 6 | * |
10 | * This program is distributed in the hope that it will be useful, | 7 | * This program is distributed in the hope that it will be useful, |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | * GNU General Public License for more details. | 10 | * GNU General Public License for more details. |
14 | * | 11 | * |
12 | * You should have received a copy of the GNU General Public License | ||
13 | * along with this program; if not, write to the Free Software | ||
14 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
15 | * 02110-1301, USA. | ||
16 | * | ||
15 | */ | 17 | */ |
16 | 18 | ||
17 | #include <mach/msm_iomap.h> | 19 | #if defined(CONFIG_ARM_GIC) |
18 | 20 | #include <mach/entry-macro-qgic.S> | |
19 | .macro disable_fiq | 21 | #else |
20 | .endm | 22 | #include <mach/entry-macro-vic.S> |
21 | 23 | #endif | |
22 | .macro get_irqnr_preamble, base, tmp | ||
23 | @ enable imprecise aborts | ||
24 | cpsie a | ||
25 | mov \base, #MSM_VIC_BASE | ||
26 | .endm | ||
27 | |||
28 | .macro arch_ret_to_user, tmp1, tmp2 | ||
29 | .endm | ||
30 | |||
31 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
32 | @ 0xD0 has irq# or old irq# if the irq has been handled | ||
33 | @ 0xD4 has irq# or -1 if none pending *but* if you just | ||
34 | @ read 0xD4 you never get the first irq for some reason | ||
35 | ldr \irqnr, [\base, #0xD0] | ||
36 | ldr \irqnr, [\base, #0xD4] | ||
37 | cmp \irqnr, #0xffffffff | ||
38 | .endm | ||