diff options
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/asi.h | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/leon.h | 362 | ||||
-rw-r--r-- | arch/sparc/include/asm/leon_amba.h | 263 | ||||
-rw-r--r-- | arch/sparc/include/asm/machines.h | 6 | ||||
-rw-r--r-- | arch/sparc/include/asm/nmi.h | 5 | ||||
-rw-r--r-- | arch/sparc/include/asm/perf_counter.h | 14 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtsrmmu.h | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/prom.h | 3 | ||||
-rw-r--r-- | arch/sparc/include/asm/system_32.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/system_64.h | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/types.h | 27 | ||||
-rw-r--r-- | arch/sparc/include/asm/uaccess_64.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd.h | 3 |
13 files changed, 674 insertions, 24 deletions
diff --git a/arch/sparc/include/asm/asi.h b/arch/sparc/include/asm/asi.h index 74703c5ef985..b2e3db63a64b 100644 --- a/arch/sparc/include/asm/asi.h +++ b/arch/sparc/include/asm/asi.h | |||
@@ -40,7 +40,11 @@ | |||
40 | #define ASI_M_UNA01 0x01 /* Same here... */ | 40 | #define ASI_M_UNA01 0x01 /* Same here... */ |
41 | #define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ | 41 | #define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ |
42 | #define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ | 42 | #define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ |
43 | #ifndef CONFIG_SPARC_LEON | ||
43 | #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ | 44 | #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ |
45 | #else | ||
46 | #define ASI_M_MMUREGS 0x19 | ||
47 | #endif /* CONFIG_SPARC_LEON */ | ||
44 | #define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ | 48 | #define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ |
45 | #define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ | 49 | #define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ |
46 | #define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */ | 50 | #define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */ |
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h new file mode 100644 index 000000000000..28a42b73f64f --- /dev/null +++ b/arch/sparc/include/asm/leon.h | |||
@@ -0,0 +1,362 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 Konrad Eisele (eiselekd@web.de,konrad@gaisler.com) Gaisler Research | ||
3 | * Copyright (C) 2004 Stefan Holst (mail@s-holst.de) Uni-Stuttgart | ||
4 | * Copyright (C) 2009 Daniel Hellstrom (daniel@gaisler.com) Aeroflex Gaisler AB | ||
5 | * Copyright (C) 2009 Konrad Eisele (konrad@gaisler.com) Aeroflex Gaisler AB | ||
6 | */ | ||
7 | |||
8 | #ifndef LEON_H_INCLUDE | ||
9 | #define LEON_H_INCLUDE | ||
10 | |||
11 | #ifdef CONFIG_SPARC_LEON | ||
12 | |||
13 | #define ASI_LEON_NOCACHE 0x01 | ||
14 | |||
15 | #define ASI_LEON_DCACHE_MISS 0x1 | ||
16 | |||
17 | #define ASI_LEON_CACHEREGS 0x02 | ||
18 | #define ASI_LEON_IFLUSH 0x10 | ||
19 | #define ASI_LEON_DFLUSH 0x11 | ||
20 | |||
21 | #define ASI_LEON_MMUFLUSH 0x18 | ||
22 | #define ASI_LEON_MMUREGS 0x19 | ||
23 | #define ASI_LEON_BYPASS 0x1c | ||
24 | #define ASI_LEON_FLUSH_PAGE 0x10 | ||
25 | |||
26 | /* mmu register access, ASI_LEON_MMUREGS */ | ||
27 | #define LEON_CNR_CTRL 0x000 | ||
28 | #define LEON_CNR_CTXP 0x100 | ||
29 | #define LEON_CNR_CTX 0x200 | ||
30 | #define LEON_CNR_F 0x300 | ||
31 | #define LEON_CNR_FADDR 0x400 | ||
32 | |||
33 | #define LEON_CNR_CTX_NCTX 256 /*number of MMU ctx */ | ||
34 | |||
35 | #define LEON_CNR_CTRL_TLBDIS 0x80000000 | ||
36 | |||
37 | #define LEON_MMUTLB_ENT_MAX 64 | ||
38 | |||
39 | /* | ||
40 | * diagnostic access from mmutlb.vhd: | ||
41 | * 0: pte address | ||
42 | * 4: pte | ||
43 | * 8: additional flags | ||
44 | */ | ||
45 | #define LEON_DIAGF_LVL 0x3 | ||
46 | #define LEON_DIAGF_WR 0x8 | ||
47 | #define LEON_DIAGF_WR_SHIFT 3 | ||
48 | #define LEON_DIAGF_HIT 0x10 | ||
49 | #define LEON_DIAGF_HIT_SHIFT 4 | ||
50 | #define LEON_DIAGF_CTX 0x1fe0 | ||
51 | #define LEON_DIAGF_CTX_SHIFT 5 | ||
52 | #define LEON_DIAGF_VALID 0x2000 | ||
53 | #define LEON_DIAGF_VALID_SHIFT 13 | ||
54 | |||
55 | /* | ||
56 | * Interrupt Sources | ||
57 | * | ||
58 | * The interrupt source numbers directly map to the trap type and to | ||
59 | * the bits used in the Interrupt Clear, Interrupt Force, Interrupt Mask, | ||
60 | * and the Interrupt Pending Registers. | ||
61 | */ | ||
62 | #define LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR 1 | ||
63 | #define LEON_INTERRUPT_UART_1_RX_TX 2 | ||
64 | #define LEON_INTERRUPT_UART_0_RX_TX 3 | ||
65 | #define LEON_INTERRUPT_EXTERNAL_0 4 | ||
66 | #define LEON_INTERRUPT_EXTERNAL_1 5 | ||
67 | #define LEON_INTERRUPT_EXTERNAL_2 6 | ||
68 | #define LEON_INTERRUPT_EXTERNAL_3 7 | ||
69 | #define LEON_INTERRUPT_TIMER1 8 | ||
70 | #define LEON_INTERRUPT_TIMER2 9 | ||
71 | #define LEON_INTERRUPT_EMPTY1 10 | ||
72 | #define LEON_INTERRUPT_EMPTY2 11 | ||
73 | #define LEON_INTERRUPT_OPEN_ETH 12 | ||
74 | #define LEON_INTERRUPT_EMPTY4 13 | ||
75 | #define LEON_INTERRUPT_EMPTY5 14 | ||
76 | #define LEON_INTERRUPT_EMPTY6 15 | ||
77 | |||
78 | /* irq masks */ | ||
79 | #define LEON_HARD_INT(x) (1 << (x)) /* irq 0-15 */ | ||
80 | #define LEON_IRQMASK_R 0x0000fffe /* bit 15- 1 of lregs.irqmask */ | ||
81 | #define LEON_IRQPRIO_R 0xfffe0000 /* bit 31-17 of lregs.irqmask */ | ||
82 | |||
83 | /* leon uart register definitions */ | ||
84 | #define LEON_OFF_UDATA 0x0 | ||
85 | #define LEON_OFF_USTAT 0x4 | ||
86 | #define LEON_OFF_UCTRL 0x8 | ||
87 | #define LEON_OFF_USCAL 0xc | ||
88 | |||
89 | #define LEON_UCTRL_RE 0x01 | ||
90 | #define LEON_UCTRL_TE 0x02 | ||
91 | #define LEON_UCTRL_RI 0x04 | ||
92 | #define LEON_UCTRL_TI 0x08 | ||
93 | #define LEON_UCTRL_PS 0x10 | ||
94 | #define LEON_UCTRL_PE 0x20 | ||
95 | #define LEON_UCTRL_FL 0x40 | ||
96 | #define LEON_UCTRL_LB 0x80 | ||
97 | |||
98 | #define LEON_USTAT_DR 0x01 | ||
99 | #define LEON_USTAT_TS 0x02 | ||
100 | #define LEON_USTAT_TH 0x04 | ||
101 | #define LEON_USTAT_BR 0x08 | ||
102 | #define LEON_USTAT_OV 0x10 | ||
103 | #define LEON_USTAT_PE 0x20 | ||
104 | #define LEON_USTAT_FE 0x40 | ||
105 | |||
106 | #define LEON_MCFG2_SRAMDIS 0x00002000 | ||
107 | #define LEON_MCFG2_SDRAMEN 0x00004000 | ||
108 | #define LEON_MCFG2_SRAMBANKSZ 0x00001e00 /* [12-9] */ | ||
109 | #define LEON_MCFG2_SRAMBANKSZ_SHIFT 9 | ||
110 | #define LEON_MCFG2_SDRAMBANKSZ 0x03800000 /* [25-23] */ | ||
111 | #define LEON_MCFG2_SDRAMBANKSZ_SHIFT 23 | ||
112 | |||
113 | #define LEON_TCNT0_MASK 0x7fffff | ||
114 | |||
115 | #define LEON_USTAT_ERROR (LEON_USTAT_OV | LEON_USTAT_PE | LEON_USTAT_FE) | ||
116 | /* no break yet */ | ||
117 | |||
118 | #define ASI_LEON3_SYSCTRL 0x02 | ||
119 | #define ASI_LEON3_SYSCTRL_ICFG 0x08 | ||
120 | #define ASI_LEON3_SYSCTRL_DCFG 0x0c | ||
121 | #define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27) | ||
122 | #define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf)) | ||
123 | |||
124 | #ifndef __ASSEMBLY__ | ||
125 | |||
126 | /* do a virtual address read without cache */ | ||
127 | static inline unsigned long leon_readnobuffer_reg(unsigned long paddr) | ||
128 | { | ||
129 | unsigned long retval; | ||
130 | __asm__ __volatile__("lda [%1] %2, %0\n\t" : | ||
131 | "=r"(retval) : "r"(paddr), "i"(ASI_LEON_NOCACHE)); | ||
132 | return retval; | ||
133 | } | ||
134 | |||
135 | /* do a physical address bypass write, i.e. for 0x80000000 */ | ||
136 | static inline void leon_store_reg(unsigned long paddr, unsigned long value) | ||
137 | { | ||
138 | __asm__ __volatile__("sta %0, [%1] %2\n\t" : : "r"(value), "r"(paddr), | ||
139 | "i"(ASI_LEON_BYPASS) : "memory"); | ||
140 | } | ||
141 | |||
142 | /* do a physical address bypass load, i.e. for 0x80000000 */ | ||
143 | static inline unsigned long leon_load_reg(unsigned long paddr) | ||
144 | { | ||
145 | unsigned long retval; | ||
146 | __asm__ __volatile__("lda [%1] %2, %0\n\t" : | ||
147 | "=r"(retval) : "r"(paddr), "i"(ASI_LEON_BYPASS)); | ||
148 | return retval; | ||
149 | } | ||
150 | |||
151 | extern inline void leon_srmmu_disabletlb(void) | ||
152 | { | ||
153 | unsigned int retval; | ||
154 | __asm__ __volatile__("lda [%%g0] %2, %0\n\t" : "=r"(retval) : "r"(0), | ||
155 | "i"(ASI_LEON_MMUREGS)); | ||
156 | retval |= LEON_CNR_CTRL_TLBDIS; | ||
157 | __asm__ __volatile__("sta %0, [%%g0] %2\n\t" : : "r"(retval), "r"(0), | ||
158 | "i"(ASI_LEON_MMUREGS) : "memory"); | ||
159 | } | ||
160 | |||
161 | extern inline void leon_srmmu_enabletlb(void) | ||
162 | { | ||
163 | unsigned int retval; | ||
164 | __asm__ __volatile__("lda [%%g0] %2, %0\n\t" : "=r"(retval) : "r"(0), | ||
165 | "i"(ASI_LEON_MMUREGS)); | ||
166 | retval = retval & ~LEON_CNR_CTRL_TLBDIS; | ||
167 | __asm__ __volatile__("sta %0, [%%g0] %2\n\t" : : "r"(retval), "r"(0), | ||
168 | "i"(ASI_LEON_MMUREGS) : "memory"); | ||
169 | } | ||
170 | |||
171 | /* macro access for leon_load_reg() and leon_store_reg() */ | ||
172 | #define LEON3_BYPASS_LOAD_PA(x) (leon_load_reg((unsigned long)(x))) | ||
173 | #define LEON3_BYPASS_STORE_PA(x, v) (leon_store_reg((unsigned long)(x), (unsigned long)(v))) | ||
174 | #define LEON3_BYPASS_ANDIN_PA(x, v) LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) & v) | ||
175 | #define LEON3_BYPASS_ORIN_PA(x, v) LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) | v) | ||
176 | #define LEON_BYPASS_LOAD_PA(x) leon_load_reg((unsigned long)(x)) | ||
177 | #define LEON_BYPASS_STORE_PA(x, v) leon_store_reg((unsigned long)(x), (unsigned long)(v)) | ||
178 | #define LEON_REGLOAD_PA(x) leon_load_reg((unsigned long)(x)+LEON_PREGS) | ||
179 | #define LEON_REGSTORE_PA(x, v) leon_store_reg((unsigned long)(x)+LEON_PREGS, (unsigned long)(v)) | ||
180 | #define LEON_REGSTORE_OR_PA(x, v) LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) | (unsigned long)(v)) | ||
181 | #define LEON_REGSTORE_AND_PA(x, v) LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) & (unsigned long)(v)) | ||
182 | |||
183 | /* macro access for leon_readnobuffer_reg() */ | ||
184 | #define LEON_BYPASSCACHE_LOAD_VA(x) leon_readnobuffer_reg((unsigned long)(x)) | ||
185 | |||
186 | extern void sparc_leon_eirq_register(int eirq); | ||
187 | extern void leon_init(void); | ||
188 | extern void leon_switch_mm(void); | ||
189 | extern void leon_init_IRQ(void); | ||
190 | |||
191 | extern unsigned long last_valid_pfn; | ||
192 | |||
193 | extern inline unsigned long sparc_leon3_get_dcachecfg(void) | ||
194 | { | ||
195 | unsigned int retval; | ||
196 | __asm__ __volatile__("lda [%1] %2, %0\n\t" : | ||
197 | "=r"(retval) : | ||
198 | "r"(ASI_LEON3_SYSCTRL_DCFG), | ||
199 | "i"(ASI_LEON3_SYSCTRL)); | ||
200 | return retval; | ||
201 | } | ||
202 | |||
203 | /* enable snooping */ | ||
204 | extern inline void sparc_leon3_enable_snooping(void) | ||
205 | { | ||
206 | __asm__ __volatile__ ("lda [%%g0] 2, %%l1\n\t" | ||
207 | "set 0x800000, %%l2\n\t" | ||
208 | "or %%l2, %%l1, %%l2\n\t" | ||
209 | "sta %%l2, [%%g0] 2\n\t" : : : "l1", "l2"); | ||
210 | }; | ||
211 | |||
212 | extern inline void sparc_leon3_disable_cache(void) | ||
213 | { | ||
214 | __asm__ __volatile__ ("lda [%%g0] 2, %%l1\n\t" | ||
215 | "set 0x00000f, %%l2\n\t" | ||
216 | "andn %%l2, %%l1, %%l2\n\t" | ||
217 | "sta %%l2, [%%g0] 2\n\t" : : : "l1", "l2"); | ||
218 | }; | ||
219 | |||
220 | #endif /*!__ASSEMBLY__*/ | ||
221 | |||
222 | #ifdef CONFIG_SMP | ||
223 | # define LEON3_IRQ_RESCHEDULE 13 | ||
224 | # define LEON3_IRQ_TICKER (leon_percpu_timer_dev[0].irq) | ||
225 | # define LEON3_IRQ_CROSS_CALL 15 | ||
226 | #endif | ||
227 | |||
228 | #if defined(PAGE_SIZE_LEON_8K) | ||
229 | #define LEON_PAGE_SIZE_LEON 1 | ||
230 | #elif defined(PAGE_SIZE_LEON_16K) | ||
231 | #define LEON_PAGE_SIZE_LEON 2) | ||
232 | #else | ||
233 | #define LEON_PAGE_SIZE_LEON 0 | ||
234 | #endif | ||
235 | |||
236 | #if LEON_PAGE_SIZE_LEON == 0 | ||
237 | /* [ 8, 6, 6 ] + 12 */ | ||
238 | #define LEON_PGD_SH 24 | ||
239 | #define LEON_PGD_M 0xff | ||
240 | #define LEON_PMD_SH 18 | ||
241 | #define LEON_PMD_SH_V (LEON_PGD_SH-2) | ||
242 | #define LEON_PMD_M 0x3f | ||
243 | #define LEON_PTE_SH 12 | ||
244 | #define LEON_PTE_M 0x3f | ||
245 | #elif LEON_PAGE_SIZE_LEON == 1 | ||
246 | /* [ 7, 6, 6 ] + 13 */ | ||
247 | #define LEON_PGD_SH 25 | ||
248 | #define LEON_PGD_M 0x7f | ||
249 | #define LEON_PMD_SH 19 | ||
250 | #define LEON_PMD_SH_V (LEON_PGD_SH-1) | ||
251 | #define LEON_PMD_M 0x3f | ||
252 | #define LEON_PTE_SH 13 | ||
253 | #define LEON_PTE_M 0x3f | ||
254 | #elif LEON_PAGE_SIZE_LEON == 2 | ||
255 | /* [ 6, 6, 6 ] + 14 */ | ||
256 | #define LEON_PGD_SH 26 | ||
257 | #define LEON_PGD_M 0x3f | ||
258 | #define LEON_PMD_SH 20 | ||
259 | #define LEON_PMD_SH_V (LEON_PGD_SH-0) | ||
260 | #define LEON_PMD_M 0x3f | ||
261 | #define LEON_PTE_SH 14 | ||
262 | #define LEON_PTE_M 0x3f | ||
263 | #elif LEON_PAGE_SIZE_LEON == 3 | ||
264 | /* [ 4, 7, 6 ] + 15 */ | ||
265 | #define LEON_PGD_SH 28 | ||
266 | #define LEON_PGD_M 0x0f | ||
267 | #define LEON_PMD_SH 21 | ||
268 | #define LEON_PMD_SH_V (LEON_PGD_SH-0) | ||
269 | #define LEON_PMD_M 0x7f | ||
270 | #define LEON_PTE_SH 15 | ||
271 | #define LEON_PTE_M 0x3f | ||
272 | #else | ||
273 | #error cannot determine LEON_PAGE_SIZE_LEON | ||
274 | #endif | ||
275 | |||
276 | #define PAGE_MIN_SHIFT (12) | ||
277 | #define PAGE_MIN_SIZE (1UL << PAGE_MIN_SHIFT) | ||
278 | |||
279 | #define LEON3_XCCR_SETS_MASK 0x07000000UL | ||
280 | #define LEON3_XCCR_SSIZE_MASK 0x00f00000UL | ||
281 | |||
282 | #define LEON2_CCR_DSETS_MASK 0x03000000UL | ||
283 | #define LEON2_CFG_SSIZE_MASK 0x00007000UL | ||
284 | |||
285 | #ifndef __ASSEMBLY__ | ||
286 | extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr); | ||
287 | extern void leon_flush_icache_all(void); | ||
288 | extern void leon_flush_dcache_all(void); | ||
289 | extern void leon_flush_cache_all(void); | ||
290 | extern void leon_flush_tlb_all(void); | ||
291 | extern int leon_flush_during_switch; | ||
292 | extern int leon_flush_needed(void); | ||
293 | |||
294 | struct vm_area_struct; | ||
295 | extern void leon_flush_icache_all(void); | ||
296 | extern void leon_flush_dcache_all(void); | ||
297 | extern void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page); | ||
298 | extern void leon_flush_cache_all(void); | ||
299 | extern void leon_flush_tlb_all(void); | ||
300 | extern int leon_flush_during_switch; | ||
301 | extern int leon_flush_needed(void); | ||
302 | extern void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page); | ||
303 | |||
304 | /* struct that hold LEON3 cache configuration registers */ | ||
305 | struct leon3_cacheregs { | ||
306 | unsigned long ccr; /* 0x00 - Cache Control Register */ | ||
307 | unsigned long iccr; /* 0x08 - Instruction Cache Configuration Register */ | ||
308 | unsigned long dccr; /* 0x0c - Data Cache Configuration Register */ | ||
309 | }; | ||
310 | |||
311 | /* struct that hold LEON2 cache configuration register | ||
312 | * & configuration register | ||
313 | */ | ||
314 | struct leon2_cacheregs { | ||
315 | unsigned long ccr, cfg; | ||
316 | }; | ||
317 | |||
318 | #ifdef __KERNEL__ | ||
319 | |||
320 | #include <linux/interrupt.h> | ||
321 | |||
322 | struct device_node; | ||
323 | extern int sparc_leon_eirq_get(int eirq, int cpu); | ||
324 | extern irqreturn_t sparc_leon_eirq_isr(int dummy, void *dev_id); | ||
325 | extern void sparc_leon_eirq_register(int eirq); | ||
326 | extern void leon_clear_clock_irq(void); | ||
327 | extern void leon_load_profile_irq(int cpu, unsigned int limit); | ||
328 | extern void leon_init_timers(irq_handler_t counter_fn); | ||
329 | extern void leon_clear_clock_irq(void); | ||
330 | extern void leon_load_profile_irq(int cpu, unsigned int limit); | ||
331 | extern void leon_trans_init(struct device_node *dp); | ||
332 | extern void leon_node_init(struct device_node *dp, struct device_node ***nextp); | ||
333 | extern void leon_init_IRQ(void); | ||
334 | extern void leon_init(void); | ||
335 | extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr); | ||
336 | extern void init_leon(void); | ||
337 | extern void poke_leonsparc(void); | ||
338 | extern void leon3_getCacheRegs(struct leon3_cacheregs *regs); | ||
339 | extern int leon_flush_needed(void); | ||
340 | extern void leon_switch_mm(void); | ||
341 | extern int srmmu_swprobe_trace; | ||
342 | |||
343 | #endif /* __KERNEL__ */ | ||
344 | |||
345 | #endif /* __ASSEMBLY__ */ | ||
346 | |||
347 | /* macros used in leon_mm.c */ | ||
348 | #define PFN(x) ((x) >> PAGE_SHIFT) | ||
349 | #define _pfn_valid(pfn) ((pfn < last_valid_pfn) && (pfn >= PFN(phys_base))) | ||
350 | #define _SRMMU_PTE_PMASK_LEON 0xffffffff | ||
351 | |||
352 | #else /* defined(CONFIG_SPARC_LEON) */ | ||
353 | |||
354 | /* nop definitions for !LEON case */ | ||
355 | #define leon_init() do {} while (0) | ||
356 | #define leon_switch_mm() do {} while (0) | ||
357 | #define leon_init_IRQ() do {} while (0) | ||
358 | #define init_leon() do {} while (0) | ||
359 | |||
360 | #endif /* !defined(CONFIG_SPARC_LEON) */ | ||
361 | |||
362 | #endif | ||
diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h new file mode 100644 index 000000000000..618e88821795 --- /dev/null +++ b/arch/sparc/include/asm/leon_amba.h | |||
@@ -0,0 +1,263 @@ | |||
1 | /* | ||
2 | *Copyright (C) 2004 Konrad Eisele (eiselekd@web.de,konrad@gaisler.com), Gaisler Research | ||
3 | *Copyright (C) 2004 Stefan Holst (mail@s-holst.de), Uni-Stuttgart | ||
4 | *Copyright (C) 2009 Daniel Hellstrom (daniel@gaisler.com),Konrad Eisele (konrad@gaisler.com) Aeroflex Gaisler AB | ||
5 | */ | ||
6 | |||
7 | #ifndef LEON_AMBA_H_INCLUDE | ||
8 | #define LEON_AMBA_H_INCLUDE | ||
9 | |||
10 | #ifndef __ASSEMBLY__ | ||
11 | |||
12 | struct amba_prom_registers { | ||
13 | unsigned int phys_addr; /* The physical address of this register */ | ||
14 | unsigned int reg_size; /* How many bytes does this register take up? */ | ||
15 | }; | ||
16 | |||
17 | #endif | ||
18 | |||
19 | /* | ||
20 | * The following defines the bits in the LEON UART Status Registers. | ||
21 | */ | ||
22 | |||
23 | #define LEON_REG_UART_STATUS_DR 0x00000001 /* Data Ready */ | ||
24 | #define LEON_REG_UART_STATUS_TSE 0x00000002 /* TX Send Register Empty */ | ||
25 | #define LEON_REG_UART_STATUS_THE 0x00000004 /* TX Hold Register Empty */ | ||
26 | #define LEON_REG_UART_STATUS_BR 0x00000008 /* Break Error */ | ||
27 | #define LEON_REG_UART_STATUS_OE 0x00000010 /* RX Overrun Error */ | ||
28 | #define LEON_REG_UART_STATUS_PE 0x00000020 /* RX Parity Error */ | ||
29 | #define LEON_REG_UART_STATUS_FE 0x00000040 /* RX Framing Error */ | ||
30 | #define LEON_REG_UART_STATUS_ERR 0x00000078 /* Error Mask */ | ||
31 | |||
32 | /* | ||
33 | * The following defines the bits in the LEON UART Ctrl Registers. | ||
34 | */ | ||
35 | |||
36 | #define LEON_REG_UART_CTRL_RE 0x00000001 /* Receiver enable */ | ||
37 | #define LEON_REG_UART_CTRL_TE 0x00000002 /* Transmitter enable */ | ||
38 | #define LEON_REG_UART_CTRL_RI 0x00000004 /* Receiver interrupt enable */ | ||
39 | #define LEON_REG_UART_CTRL_TI 0x00000008 /* Transmitter irq */ | ||
40 | #define LEON_REG_UART_CTRL_PS 0x00000010 /* Parity select */ | ||
41 | #define LEON_REG_UART_CTRL_PE 0x00000020 /* Parity enable */ | ||
42 | #define LEON_REG_UART_CTRL_FL 0x00000040 /* Flow control enable */ | ||
43 | #define LEON_REG_UART_CTRL_LB 0x00000080 /* Loop Back enable */ | ||
44 | |||
45 | #define LEON3_GPTIMER_EN 1 | ||
46 | #define LEON3_GPTIMER_RL 2 | ||
47 | #define LEON3_GPTIMER_LD 4 | ||
48 | #define LEON3_GPTIMER_IRQEN 8 | ||
49 | #define LEON3_GPTIMER_SEPIRQ 8 | ||
50 | |||
51 | #define LEON23_REG_TIMER_CONTROL_EN 0x00000001 /* 1 = enable counting */ | ||
52 | /* 0 = hold scalar and counter */ | ||
53 | #define LEON23_REG_TIMER_CONTROL_RL 0x00000002 /* 1 = reload at 0 */ | ||
54 | /* 0 = stop at 0 */ | ||
55 | #define LEON23_REG_TIMER_CONTROL_LD 0x00000004 /* 1 = load counter */ | ||
56 | /* 0 = no function */ | ||
57 | #define LEON23_REG_TIMER_CONTROL_IQ 0x00000008 /* 1 = irq enable */ | ||
58 | /* 0 = no function */ | ||
59 | |||
60 | /* | ||
61 | * The following defines the bits in the LEON PS/2 Status Registers. | ||
62 | */ | ||
63 | |||
64 | #define LEON_REG_PS2_STATUS_DR 0x00000001 /* Data Ready */ | ||
65 | #define LEON_REG_PS2_STATUS_PE 0x00000002 /* Parity error */ | ||
66 | #define LEON_REG_PS2_STATUS_FE 0x00000004 /* Framing error */ | ||
67 | #define LEON_REG_PS2_STATUS_KI 0x00000008 /* Keyboard inhibit */ | ||
68 | #define LEON_REG_PS2_STATUS_RF 0x00000010 /* RX buffer full */ | ||
69 | #define LEON_REG_PS2_STATUS_TF 0x00000020 /* TX buffer full */ | ||
70 | |||
71 | /* | ||
72 | * The following defines the bits in the LEON PS/2 Ctrl Registers. | ||
73 | */ | ||
74 | |||
75 | #define LEON_REG_PS2_CTRL_RE 0x00000001 /* Receiver enable */ | ||
76 | #define LEON_REG_PS2_CTRL_TE 0x00000002 /* Transmitter enable */ | ||
77 | #define LEON_REG_PS2_CTRL_RI 0x00000004 /* Keyboard receive irq */ | ||
78 | #define LEON_REG_PS2_CTRL_TI 0x00000008 /* Keyboard transmit irq */ | ||
79 | |||
80 | #define LEON3_IRQMPSTATUS_CPUNR 28 | ||
81 | #define LEON3_IRQMPSTATUS_BROADCAST 27 | ||
82 | |||
83 | #define GPTIMER_CONFIG_IRQNT(a) (((a) >> 3) & 0x1f) | ||
84 | #define GPTIMER_CONFIG_ISSEP(a) ((a) & (1 << 8)) | ||
85 | #define GPTIMER_CONFIG_NTIMERS(a) ((a) & (0x7)) | ||
86 | #define LEON3_GPTIMER_CTRL_PENDING 0x10 | ||
87 | #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7) | ||
88 | #define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0) | ||
89 | |||
90 | #ifdef CONFIG_SPARC_LEON | ||
91 | |||
92 | #ifndef __ASSEMBLY__ | ||
93 | |||
94 | struct leon3_irqctrl_regs_map { | ||
95 | u32 ilevel; | ||
96 | u32 ipend; | ||
97 | u32 iforce; | ||
98 | u32 iclear; | ||
99 | u32 mpstatus; | ||
100 | u32 mpbroadcast; | ||
101 | u32 notused02; | ||
102 | u32 notused03; | ||
103 | u32 notused10; | ||
104 | u32 notused11; | ||
105 | u32 notused12; | ||
106 | u32 notused13; | ||
107 | u32 notused20; | ||
108 | u32 notused21; | ||
109 | u32 notused22; | ||
110 | u32 notused23; | ||
111 | u32 mask[16]; | ||
112 | u32 force[16]; | ||
113 | /* Extended IRQ registers */ | ||
114 | u32 intid[16]; /* 0xc0 */ | ||
115 | }; | ||
116 | |||
117 | struct leon3_apbuart_regs_map { | ||
118 | u32 data; | ||
119 | u32 status; | ||
120 | u32 ctrl; | ||
121 | u32 scaler; | ||
122 | }; | ||
123 | |||
124 | struct leon3_gptimerelem_regs_map { | ||
125 | u32 val; | ||
126 | u32 rld; | ||
127 | u32 ctrl; | ||
128 | u32 unused; | ||
129 | }; | ||
130 | |||
131 | struct leon3_gptimer_regs_map { | ||
132 | u32 scalar; | ||
133 | u32 scalar_reload; | ||
134 | u32 config; | ||
135 | u32 unused; | ||
136 | struct leon3_gptimerelem_regs_map e[8]; | ||
137 | }; | ||
138 | |||
139 | /* | ||
140 | * Types and structure used for AMBA Plug & Play bus scanning | ||
141 | */ | ||
142 | |||
143 | #define AMBA_MAXAPB_DEVS 64 | ||
144 | #define AMBA_MAXAPB_DEVS_PERBUS 16 | ||
145 | |||
146 | struct amba_device_table { | ||
147 | int devnr; /* number of devices on AHB or APB bus */ | ||
148 | unsigned int *addr[16]; /* addresses to the devices configuration tables */ | ||
149 | unsigned int allocbits[1]; /* 0=unallocated, 1=allocated driver */ | ||
150 | }; | ||
151 | |||
152 | struct amba_apbslv_device_table { | ||
153 | int devnr; /* number of devices on AHB or APB bus */ | ||
154 | unsigned int *addr[AMBA_MAXAPB_DEVS]; /* addresses to the devices configuration tables */ | ||
155 | unsigned int apbmst[AMBA_MAXAPB_DEVS]; /* apb master if a entry is a apb slave */ | ||
156 | unsigned int apbmstidx[AMBA_MAXAPB_DEVS]; /* apb master idx if a entry is a apb slave */ | ||
157 | unsigned int allocbits[4]; /* 0=unallocated, 1=allocated driver */ | ||
158 | }; | ||
159 | |||
160 | struct amba_confarea_type { | ||
161 | struct amba_confarea_type *next;/* next bus in chain */ | ||
162 | struct amba_device_table ahbmst; | ||
163 | struct amba_device_table ahbslv; | ||
164 | struct amba_apbslv_device_table apbslv; | ||
165 | unsigned int apbmst; | ||
166 | }; | ||
167 | |||
168 | /* collect apb slaves */ | ||
169 | struct amba_apb_device { | ||
170 | unsigned int start, irq, bus_id; | ||
171 | struct amba_confarea_type *bus; | ||
172 | }; | ||
173 | |||
174 | /* collect ahb slaves */ | ||
175 | struct amba_ahb_device { | ||
176 | unsigned int start[4], irq, bus_id; | ||
177 | struct amba_confarea_type *bus; | ||
178 | }; | ||
179 | |||
180 | struct device_node; | ||
181 | void _amba_init(struct device_node *dp, struct device_node ***nextp); | ||
182 | |||
183 | extern struct leon3_irqctrl_regs_map *leon3_irqctrl_regs; | ||
184 | extern struct leon3_gptimer_regs_map *leon3_gptimer_regs; | ||
185 | extern struct amba_apb_device leon_percpu_timer_dev[16]; | ||
186 | extern int leondebug_irq_disable; | ||
187 | extern int leon_debug_irqout; | ||
188 | extern unsigned long leon3_gptimer_irq; | ||
189 | extern unsigned int sparc_leon_eirq; | ||
190 | |||
191 | #endif /* __ASSEMBLY__ */ | ||
192 | |||
193 | #define LEON3_IO_AREA 0xfff00000 | ||
194 | #define LEON3_CONF_AREA 0xff000 | ||
195 | #define LEON3_AHB_SLAVE_CONF_AREA (1 << 11) | ||
196 | |||
197 | #define LEON3_AHB_CONF_WORDS 8 | ||
198 | #define LEON3_APB_CONF_WORDS 2 | ||
199 | #define LEON3_AHB_MASTERS 16 | ||
200 | #define LEON3_AHB_SLAVES 16 | ||
201 | #define LEON3_APB_SLAVES 16 | ||
202 | #define LEON3_APBUARTS 8 | ||
203 | |||
204 | /* Vendor codes */ | ||
205 | #define VENDOR_GAISLER 1 | ||
206 | #define VENDOR_PENDER 2 | ||
207 | #define VENDOR_ESA 4 | ||
208 | #define VENDOR_OPENCORES 8 | ||
209 | |||
210 | /* Gaisler Research device id's */ | ||
211 | #define GAISLER_LEON3 0x003 | ||
212 | #define GAISLER_LEON3DSU 0x004 | ||
213 | #define GAISLER_ETHAHB 0x005 | ||
214 | #define GAISLER_APBMST 0x006 | ||
215 | #define GAISLER_AHBUART 0x007 | ||
216 | #define GAISLER_SRCTRL 0x008 | ||
217 | #define GAISLER_SDCTRL 0x009 | ||
218 | #define GAISLER_APBUART 0x00C | ||
219 | #define GAISLER_IRQMP 0x00D | ||
220 | #define GAISLER_AHBRAM 0x00E | ||
221 | #define GAISLER_GPTIMER 0x011 | ||
222 | #define GAISLER_PCITRG 0x012 | ||
223 | #define GAISLER_PCISBRG 0x013 | ||
224 | #define GAISLER_PCIFBRG 0x014 | ||
225 | #define GAISLER_PCITRACE 0x015 | ||
226 | #define GAISLER_PCIDMA 0x016 | ||
227 | #define GAISLER_AHBTRACE 0x017 | ||
228 | #define GAISLER_ETHDSU 0x018 | ||
229 | #define GAISLER_PIOPORT 0x01A | ||
230 | #define GAISLER_GRGPIO 0x01A | ||
231 | #define GAISLER_AHBJTAG 0x01c | ||
232 | #define GAISLER_ETHMAC 0x01D | ||
233 | #define GAISLER_AHB2AHB 0x020 | ||
234 | #define GAISLER_USBDC 0x021 | ||
235 | #define GAISLER_ATACTRL 0x024 | ||
236 | #define GAISLER_DDRSPA 0x025 | ||
237 | #define GAISLER_USBEHC 0x026 | ||
238 | #define GAISLER_USBUHC 0x027 | ||
239 | #define GAISLER_I2CMST 0x028 | ||
240 | #define GAISLER_SPICTRL 0x02D | ||
241 | #define GAISLER_DDR2SPA 0x02E | ||
242 | #define GAISLER_SPIMCTRL 0x045 | ||
243 | #define GAISLER_LEON4 0x048 | ||
244 | #define GAISLER_LEON4DSU 0x049 | ||
245 | #define GAISLER_AHBSTAT 0x052 | ||
246 | #define GAISLER_FTMCTRL 0x054 | ||
247 | #define GAISLER_KBD 0x060 | ||
248 | #define GAISLER_VGA 0x061 | ||
249 | #define GAISLER_SVGA 0x063 | ||
250 | #define GAISLER_GRSYSMON 0x066 | ||
251 | #define GAISLER_GRACECTRL 0x067 | ||
252 | |||
253 | #define GAISLER_L2TIME 0xffd /* internal device: leon2 timer */ | ||
254 | #define GAISLER_L2C 0xffe /* internal device: leon2compat */ | ||
255 | #define GAISLER_PLUGPLAY 0xfff /* internal device: plug & play configarea */ | ||
256 | |||
257 | #define amba_vendor(x) (((x) >> 24) & 0xff) | ||
258 | |||
259 | #define amba_device(x) (((x) >> 12) & 0xfff) | ||
260 | |||
261 | #endif /* !defined(CONFIG_SPARC_LEON) */ | ||
262 | |||
263 | #endif | ||
diff --git a/arch/sparc/include/asm/machines.h b/arch/sparc/include/asm/machines.h index c28c2f248794..cd9c099567e4 100644 --- a/arch/sparc/include/asm/machines.h +++ b/arch/sparc/include/asm/machines.h | |||
@@ -15,7 +15,7 @@ struct Sun_Machine_Models { | |||
15 | /* Current number of machines we know about that has an IDPROM | 15 | /* Current number of machines we know about that has an IDPROM |
16 | * machtype entry including one entry for the 0x80 OBP machines. | 16 | * machtype entry including one entry for the 0x80 OBP machines. |
17 | */ | 17 | */ |
18 | #define NUM_SUN_MACHINES 15 | 18 | #define NUM_SUN_MACHINES 16 |
19 | 19 | ||
20 | /* The machine type in the idprom area looks like this: | 20 | /* The machine type in the idprom area looks like this: |
21 | * | 21 | * |
@@ -30,6 +30,7 @@ struct Sun_Machine_Models { | |||
30 | 30 | ||
31 | #define SM_ARCH_MASK 0xf0 | 31 | #define SM_ARCH_MASK 0xf0 |
32 | #define SM_SUN4 0x20 | 32 | #define SM_SUN4 0x20 |
33 | #define M_LEON 0x30 | ||
33 | #define SM_SUN4C 0x50 | 34 | #define SM_SUN4C 0x50 |
34 | #define SM_SUN4M 0x70 | 35 | #define SM_SUN4M 0x70 |
35 | #define SM_SUN4M_OBP 0x80 | 36 | #define SM_SUN4M_OBP 0x80 |
@@ -41,6 +42,9 @@ struct Sun_Machine_Models { | |||
41 | #define SM_4_330 0x03 /* Sun 4/300 series */ | 42 | #define SM_4_330 0x03 /* Sun 4/300 series */ |
42 | #define SM_4_470 0x04 /* Sun 4/400 series */ | 43 | #define SM_4_470 0x04 /* Sun 4/400 series */ |
43 | 44 | ||
45 | /* Leon machines */ | ||
46 | #define M_LEON3_SOC 0x02 /* Leon3 SoC */ | ||
47 | |||
44 | /* Sun4c machines Full Name - PROM NAME */ | 48 | /* Sun4c machines Full Name - PROM NAME */ |
45 | #define SM_4C_SS1 0x01 /* Sun4c SparcStation 1 - Sun 4/60 */ | 49 | #define SM_4C_SS1 0x01 /* Sun4c SparcStation 1 - Sun 4/60 */ |
46 | #define SM_4C_IPC 0x02 /* Sun4c SparcStation IPC - Sun 4/40 */ | 50 | #define SM_4C_IPC 0x02 /* Sun4c SparcStation IPC - Sun 4/40 */ |
diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h index fbd546dd4feb..72e6500e7ab0 100644 --- a/arch/sparc/include/asm/nmi.h +++ b/arch/sparc/include/asm/nmi.h | |||
@@ -5,6 +5,9 @@ extern int __init nmi_init(void); | |||
5 | extern void perfctr_irq(int irq, struct pt_regs *regs); | 5 | extern void perfctr_irq(int irq, struct pt_regs *regs); |
6 | extern void nmi_adjust_hz(unsigned int new_hz); | 6 | extern void nmi_adjust_hz(unsigned int new_hz); |
7 | 7 | ||
8 | extern int nmi_usable; | 8 | extern atomic_t nmi_active; |
9 | |||
10 | extern void start_nmi_watchdog(void *unused); | ||
11 | extern void stop_nmi_watchdog(void *unused); | ||
9 | 12 | ||
10 | #endif /* __NMI_H */ | 13 | #endif /* __NMI_H */ |
diff --git a/arch/sparc/include/asm/perf_counter.h b/arch/sparc/include/asm/perf_counter.h new file mode 100644 index 000000000000..5d7a8ca0e491 --- /dev/null +++ b/arch/sparc/include/asm/perf_counter.h | |||
@@ -0,0 +1,14 @@ | |||
1 | #ifndef __ASM_SPARC_PERF_COUNTER_H | ||
2 | #define __ASM_SPARC_PERF_COUNTER_H | ||
3 | |||
4 | extern void set_perf_counter_pending(void); | ||
5 | |||
6 | #define PERF_COUNTER_INDEX_OFFSET 0 | ||
7 | |||
8 | #ifdef CONFIG_PERF_COUNTERS | ||
9 | extern void init_hw_perf_counters(void); | ||
10 | #else | ||
11 | static inline void init_hw_perf_counters(void) { } | ||
12 | #endif | ||
13 | |||
14 | #endif | ||
diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h index 808555fc1d58..1407c07bdade 100644 --- a/arch/sparc/include/asm/pgtsrmmu.h +++ b/arch/sparc/include/asm/pgtsrmmu.h | |||
@@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(unsigned long page) | |||
267 | 267 | ||
268 | } | 268 | } |
269 | 269 | ||
270 | #ifndef CONFIG_SPARC_LEON | ||
270 | static inline unsigned long srmmu_hwprobe(unsigned long vaddr) | 271 | static inline unsigned long srmmu_hwprobe(unsigned long vaddr) |
271 | { | 272 | { |
272 | unsigned long retval; | 273 | unsigned long retval; |
@@ -278,6 +279,9 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr) | |||
278 | 279 | ||
279 | return retval; | 280 | return retval; |
280 | } | 281 | } |
282 | #else | ||
283 | #define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK) | ||
284 | #endif | ||
281 | 285 | ||
282 | static inline int | 286 | static inline int |
283 | srmmu_get_pte (unsigned long addr) | 287 | srmmu_get_pte (unsigned long addr) |
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index be8d7aaeb60d..82a190d7efc1 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h | |||
@@ -118,5 +118,8 @@ extern struct device_node *of_console_device; | |||
118 | extern char *of_console_path; | 118 | extern char *of_console_path; |
119 | extern char *of_console_options; | 119 | extern char *of_console_options; |
120 | 120 | ||
121 | extern void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp); | ||
122 | extern char *build_full_name(struct device_node *dp); | ||
123 | |||
121 | #endif /* __KERNEL__ */ | 124 | #endif /* __KERNEL__ */ |
122 | #endif /* _SPARC_PROM_H */ | 125 | #endif /* _SPARC_PROM_H */ |
diff --git a/arch/sparc/include/asm/system_32.h b/arch/sparc/include/asm/system_32.h index 751c8c17f5a0..890036b3689a 100644 --- a/arch/sparc/include/asm/system_32.h +++ b/arch/sparc/include/asm/system_32.h | |||
@@ -32,6 +32,7 @@ enum sparc_cpu { | |||
32 | sun4u = 0x05, /* V8 ploos ploos */ | 32 | sun4u = 0x05, /* V8 ploos ploos */ |
33 | sun_unknown = 0x06, | 33 | sun_unknown = 0x06, |
34 | ap1000 = 0x07, /* almost a sun4m */ | 34 | ap1000 = 0x07, /* almost a sun4m */ |
35 | sparc_leon = 0x08, /* Leon SoC */ | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | /* Really, userland should not be looking at any of this... */ | 38 | /* Really, userland should not be looking at any of this... */ |
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h index 6c077816ab28..25e848f0cad7 100644 --- a/arch/sparc/include/asm/system_64.h +++ b/arch/sparc/include/asm/system_64.h | |||
@@ -29,6 +29,10 @@ enum sparc_cpu { | |||
29 | /* This cannot ever be a sun4c :) That's just history. */ | 29 | /* This cannot ever be a sun4c :) That's just history. */ |
30 | #define ARCH_SUN4C 0 | 30 | #define ARCH_SUN4C 0 |
31 | 31 | ||
32 | extern const char *sparc_cpu_type; | ||
33 | extern const char *sparc_fpu_type; | ||
34 | extern const char *sparc_pmu_type; | ||
35 | |||
32 | extern char reboot_command[]; | 36 | extern char reboot_command[]; |
33 | 37 | ||
34 | /* These are here in an effort to more fully work around Spitfire Errata | 38 | /* These are here in an effort to more fully work around Spitfire Errata |
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h index de671d73baed..09c79a9c8516 100644 --- a/arch/sparc/include/asm/types.h +++ b/arch/sparc/include/asm/types.h | |||
@@ -8,9 +8,8 @@ | |||
8 | * need to be careful to avoid a name clashes. | 8 | * need to be careful to avoid a name clashes. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #if defined(__sparc__) && defined(__arch64__) | 11 | #if defined(__sparc__) |
12 | 12 | ||
13 | /*** SPARC 64 bit ***/ | ||
14 | #include <asm-generic/int-ll64.h> | 13 | #include <asm-generic/int-ll64.h> |
15 | 14 | ||
16 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
@@ -26,33 +25,21 @@ typedef unsigned short umode_t; | |||
26 | /* Dma addresses come in generic and 64-bit flavours. */ | 25 | /* Dma addresses come in generic and 64-bit flavours. */ |
27 | 26 | ||
28 | typedef u32 dma_addr_t; | 27 | typedef u32 dma_addr_t; |
29 | typedef u64 dma64_addr_t; | ||
30 | 28 | ||
31 | #endif /* __ASSEMBLY__ */ | 29 | #if defined(__arch64__) |
32 | 30 | ||
33 | #endif /* __KERNEL__ */ | 31 | /*** SPARC 64 bit ***/ |
32 | typedef u64 dma64_addr_t; | ||
34 | #else | 33 | #else |
35 | |||
36 | /*** SPARC 32 bit ***/ | 34 | /*** SPARC 32 bit ***/ |
37 | #include <asm-generic/int-ll64.h> | ||
38 | |||
39 | #ifndef __ASSEMBLY__ | ||
40 | |||
41 | typedef unsigned short umode_t; | ||
42 | |||
43 | #endif /* __ASSEMBLY__ */ | ||
44 | |||
45 | #ifdef __KERNEL__ | ||
46 | |||
47 | #ifndef __ASSEMBLY__ | ||
48 | |||
49 | typedef u32 dma_addr_t; | ||
50 | typedef u32 dma64_addr_t; | 35 | typedef u32 dma64_addr_t; |
51 | 36 | ||
37 | #endif /* defined(__arch64__) */ | ||
38 | |||
52 | #endif /* __ASSEMBLY__ */ | 39 | #endif /* __ASSEMBLY__ */ |
53 | 40 | ||
54 | #endif /* __KERNEL__ */ | 41 | #endif /* __KERNEL__ */ |
55 | 42 | ||
56 | #endif /* defined(__sparc__) && defined(__arch64__) */ | 43 | #endif /* defined(__sparc__) */ |
57 | 44 | ||
58 | #endif /* defined(_SPARC_TYPES_H) */ | 45 | #endif /* defined(_SPARC_TYPES_H) */ |
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index a38c03238918..9ea271e19c70 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h | |||
@@ -7,8 +7,8 @@ | |||
7 | 7 | ||
8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
9 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
10 | #include <linux/sched.h> | ||
11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
11 | #include <linux/thread_info.h> | ||
12 | #include <asm/asi.h> | 12 | #include <asm/asi.h> |
13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
14 | #include <asm/spitfire.h> | 14 | #include <asm/spitfire.h> |
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index b2c406de7d4f..706df669f3b8 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h | |||
@@ -395,8 +395,9 @@ | |||
395 | #define __NR_preadv 324 | 395 | #define __NR_preadv 324 |
396 | #define __NR_pwritev 325 | 396 | #define __NR_pwritev 325 |
397 | #define __NR_rt_tgsigqueueinfo 326 | 397 | #define __NR_rt_tgsigqueueinfo 326 |
398 | #define __NR_perf_counter_open 327 | ||
398 | 399 | ||
399 | #define NR_SYSCALLS 327 | 400 | #define NR_SYSCALLS 328 |
400 | 401 | ||
401 | #ifdef __32bit_syscall_numbers__ | 402 | #ifdef __32bit_syscall_numbers__ |
402 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, | 403 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |