.. | .. |
---|
5 | 5 | #ifdef __KERNEL__ |
---|
6 | 6 | |
---|
7 | 7 | #include <asm/ptrace.h> |
---|
| 8 | +#include <asm/barrier.h> |
---|
8 | 9 | |
---|
9 | 10 | /* |
---|
10 | 11 | * CPU interrupt mask handling. |
---|
.. | .. |
---|
13 | 14 | #define IRQMASK_REG_NAME_R "primask" |
---|
14 | 15 | #define IRQMASK_REG_NAME_W "primask" |
---|
15 | 16 | #define IRQMASK_I_BIT 1 |
---|
| 17 | +#define IRQMASK_I_POS 0 |
---|
16 | 18 | #else |
---|
17 | 19 | #define IRQMASK_REG_NAME_R "cpsr" |
---|
18 | 20 | #define IRQMASK_REG_NAME_W "cpsr_c" |
---|
19 | 21 | #define IRQMASK_I_BIT PSR_I_BIT |
---|
| 22 | +#define IRQMASK_I_POS 7 |
---|
20 | 23 | #endif |
---|
| 24 | +#define IRQMASK_i_POS 31 |
---|
21 | 25 | |
---|
22 | 26 | #if __LINUX_ARM_ARCH__ >= 6 |
---|
23 | 27 | |
---|
24 | 28 | #define arch_local_irq_save arch_local_irq_save |
---|
25 | | -static inline unsigned long arch_local_irq_save(void) |
---|
| 29 | +static inline unsigned long native_irq_save(void) |
---|
26 | 30 | { |
---|
27 | 31 | unsigned long flags; |
---|
28 | 32 | |
---|
29 | 33 | asm volatile( |
---|
30 | | - " mrs %0, " IRQMASK_REG_NAME_R " @ arch_local_irq_save\n" |
---|
| 34 | + " mrs %0, " IRQMASK_REG_NAME_R " @ native_irq_save\n" |
---|
31 | 35 | " cpsid i" |
---|
32 | 36 | : "=r" (flags) : : "memory", "cc"); |
---|
33 | 37 | return flags; |
---|
34 | 38 | } |
---|
35 | 39 | |
---|
36 | 40 | #define arch_local_irq_enable arch_local_irq_enable |
---|
37 | | -static inline void arch_local_irq_enable(void) |
---|
| 41 | +static inline void native_irq_enable(void) |
---|
38 | 42 | { |
---|
39 | 43 | asm volatile( |
---|
40 | | - " cpsie i @ arch_local_irq_enable" |
---|
| 44 | + " cpsie i @ native_irq_enable" |
---|
41 | 45 | : |
---|
42 | 46 | : |
---|
43 | 47 | : "memory", "cc"); |
---|
44 | 48 | } |
---|
45 | 49 | |
---|
46 | 50 | #define arch_local_irq_disable arch_local_irq_disable |
---|
47 | | -static inline void arch_local_irq_disable(void) |
---|
| 51 | +static inline void native_irq_disable(void) |
---|
48 | 52 | { |
---|
49 | 53 | asm volatile( |
---|
50 | | - " cpsid i @ arch_local_irq_disable" |
---|
| 54 | + " cpsid i @ native_irq_disable" |
---|
51 | 55 | : |
---|
52 | 56 | : |
---|
53 | 57 | : "memory", "cc"); |
---|
.. | .. |
---|
69 | 73 | * Save the current interrupt enable state & disable IRQs |
---|
70 | 74 | */ |
---|
71 | 75 | #define arch_local_irq_save arch_local_irq_save |
---|
72 | | -static inline unsigned long arch_local_irq_save(void) |
---|
| 76 | +static inline unsigned long native_irq_save(void) |
---|
73 | 77 | { |
---|
74 | 78 | unsigned long flags, temp; |
---|
75 | 79 | |
---|
76 | 80 | asm volatile( |
---|
77 | | - " mrs %0, cpsr @ arch_local_irq_save\n" |
---|
| 81 | + " mrs %0, cpsr @ native_irq_save\n" |
---|
78 | 82 | " orr %1, %0, #128\n" |
---|
79 | 83 | " msr cpsr_c, %1" |
---|
80 | 84 | : "=r" (flags), "=r" (temp) |
---|
.. | .. |
---|
87 | 91 | * Enable IRQs |
---|
88 | 92 | */ |
---|
89 | 93 | #define arch_local_irq_enable arch_local_irq_enable |
---|
90 | | -static inline void arch_local_irq_enable(void) |
---|
| 94 | +static inline void native_irq_enable(void) |
---|
91 | 95 | { |
---|
92 | 96 | unsigned long temp; |
---|
93 | 97 | asm volatile( |
---|
94 | | - " mrs %0, cpsr @ arch_local_irq_enable\n" |
---|
| 98 | + " mrs %0, cpsr @ native_irq_enable\n" |
---|
95 | 99 | " bic %0, %0, #128\n" |
---|
96 | 100 | " msr cpsr_c, %0" |
---|
97 | 101 | : "=r" (temp) |
---|
.. | .. |
---|
103 | 107 | * Disable IRQs |
---|
104 | 108 | */ |
---|
105 | 109 | #define arch_local_irq_disable arch_local_irq_disable |
---|
106 | | -static inline void arch_local_irq_disable(void) |
---|
| 110 | +static inline void native_irq_disable(void) |
---|
107 | 111 | { |
---|
108 | 112 | unsigned long temp; |
---|
109 | 113 | asm volatile( |
---|
110 | | - " mrs %0, cpsr @ arch_local_irq_disable\n" |
---|
| 114 | + " mrs %0, cpsr @ native_irq_disable\n" |
---|
111 | 115 | " orr %0, %0, #128\n" |
---|
112 | 116 | " msr cpsr_c, %0" |
---|
113 | 117 | : "=r" (temp) |
---|
.. | .. |
---|
149 | 153 | #define local_abt_disable() do { } while (0) |
---|
150 | 154 | #endif |
---|
151 | 155 | |
---|
| 156 | +static inline void native_irq_sync(void) |
---|
| 157 | +{ |
---|
| 158 | + native_irq_enable(); |
---|
| 159 | + isb(); |
---|
| 160 | + native_irq_disable(); |
---|
| 161 | +} |
---|
| 162 | + |
---|
152 | 163 | /* |
---|
153 | 164 | * Save the current interrupt enable state. |
---|
154 | 165 | */ |
---|
155 | 166 | #define arch_local_save_flags arch_local_save_flags |
---|
156 | | -static inline unsigned long arch_local_save_flags(void) |
---|
| 167 | +static inline unsigned long native_save_flags(void) |
---|
157 | 168 | { |
---|
158 | 169 | unsigned long flags; |
---|
159 | 170 | asm volatile( |
---|
160 | | - " mrs %0, " IRQMASK_REG_NAME_R " @ local_save_flags" |
---|
| 171 | + " mrs %0, " IRQMASK_REG_NAME_R " @ native_save_flags" |
---|
161 | 172 | : "=r" (flags) : : "memory", "cc"); |
---|
162 | 173 | return flags; |
---|
163 | 174 | } |
---|
.. | .. |
---|
166 | 177 | * restore saved IRQ & FIQ state |
---|
167 | 178 | */ |
---|
168 | 179 | #define arch_local_irq_restore arch_local_irq_restore |
---|
169 | | -static inline void arch_local_irq_restore(unsigned long flags) |
---|
| 180 | +static inline void native_irq_restore(unsigned long flags) |
---|
170 | 181 | { |
---|
171 | 182 | asm volatile( |
---|
172 | | - " msr " IRQMASK_REG_NAME_W ", %0 @ local_irq_restore" |
---|
| 183 | + " msr " IRQMASK_REG_NAME_W ", %0 @ native_irq_restore" |
---|
173 | 184 | : |
---|
174 | 185 | : "r" (flags) |
---|
175 | 186 | : "memory", "cc"); |
---|
176 | 187 | } |
---|
177 | 188 | |
---|
178 | 189 | #define arch_irqs_disabled_flags arch_irqs_disabled_flags |
---|
179 | | -static inline int arch_irqs_disabled_flags(unsigned long flags) |
---|
| 190 | +static inline int native_irqs_disabled_flags(unsigned long flags) |
---|
180 | 191 | { |
---|
181 | 192 | return flags & IRQMASK_I_BIT; |
---|
182 | 193 | } |
---|
183 | 194 | |
---|
| 195 | +static inline bool native_irqs_disabled(void) |
---|
| 196 | +{ |
---|
| 197 | + unsigned long flags = native_save_flags(); |
---|
| 198 | + return native_irqs_disabled_flags(flags); |
---|
| 199 | +} |
---|
| 200 | + |
---|
| 201 | +#include <asm/irq_pipeline.h> |
---|
184 | 202 | #include <asm-generic/irqflags.h> |
---|
185 | 203 | |
---|
186 | 204 | #endif /* ifdef __KERNEL__ */ |
---|