diff options
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/auxvec.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/elf.h | 10 | ||||
-rw-r--r-- | include/asm-powerpc/irq.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/processor.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/sparsemem.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/systemcfg.h | 64 | ||||
-rw-r--r-- | include/asm-powerpc/topology.h | 12 | ||||
-rw-r--r-- | include/asm-powerpc/udbg.h | 31 | ||||
-rw-r--r-- | include/asm-powerpc/vdso.h | 83 | ||||
-rw-r--r-- | include/asm-powerpc/vdso_datapage.h | 108 |
10 files changed, 231 insertions, 86 deletions
diff --git a/include/asm-powerpc/auxvec.h b/include/asm-powerpc/auxvec.h index 79d8c4732309..19a099b62cd6 100644 --- a/include/asm-powerpc/auxvec.h +++ b/include/asm-powerpc/auxvec.h | |||
@@ -14,8 +14,6 @@ | |||
14 | /* The vDSO location. We have to use the same value as x86 for glibc's | 14 | /* The vDSO location. We have to use the same value as x86 for glibc's |
15 | * sake :-) | 15 | * sake :-) |
16 | */ | 16 | */ |
17 | #ifdef __powerpc64__ | ||
18 | #define AT_SYSINFO_EHDR 33 | 17 | #define AT_SYSINFO_EHDR 33 |
19 | #endif | ||
20 | 18 | ||
21 | #endif | 19 | #endif |
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index feac3458d71f..3dcd65edf978 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h | |||
@@ -269,14 +269,12 @@ extern int dcache_bsize; | |||
269 | extern int icache_bsize; | 269 | extern int icache_bsize; |
270 | extern int ucache_bsize; | 270 | extern int ucache_bsize; |
271 | 271 | ||
272 | #ifdef __powerpc64__ | 272 | /* vDSO has arch_setup_additional_pages */ |
273 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES | ||
273 | struct linux_binprm; | 274 | struct linux_binprm; |
274 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES /* vDSO has arch_setup_additional_pages */ | 275 | extern int arch_setup_additional_pages(struct linux_binprm *bprm, |
275 | extern int arch_setup_additional_pages(struct linux_binprm *bprm, int executable_stack); | 276 | int executable_stack); |
276 | #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); | 277 | #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); |
277 | #else | ||
278 | #define VDSO_AUX_ENT(a,b) | ||
279 | #endif /* __powerpc64__ */ | ||
280 | 278 | ||
281 | /* | 279 | /* |
282 | * The requirements here are: | 280 | * The requirements here are: |
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index c9fbcede0ef9..8eb7e857ec4c 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h | |||
@@ -389,6 +389,7 @@ extern u64 ppc64_interrupt_controller; | |||
389 | #define SIU_INT_TIMER4 ((uint)0x0f + CPM_IRQ_OFFSET) | 389 | #define SIU_INT_TIMER4 ((uint)0x0f + CPM_IRQ_OFFSET) |
390 | #define SIU_INT_TMCNT ((uint)0x10 + CPM_IRQ_OFFSET) | 390 | #define SIU_INT_TMCNT ((uint)0x10 + CPM_IRQ_OFFSET) |
391 | #define SIU_INT_PIT ((uint)0x11 + CPM_IRQ_OFFSET) | 391 | #define SIU_INT_PIT ((uint)0x11 + CPM_IRQ_OFFSET) |
392 | #define SIU_INT_PCI ((uint)0x12 + CPM_IRQ_OFFSET) | ||
392 | #define SIU_INT_IRQ1 ((uint)0x13 + CPM_IRQ_OFFSET) | 393 | #define SIU_INT_IRQ1 ((uint)0x13 + CPM_IRQ_OFFSET) |
393 | #define SIU_INT_IRQ2 ((uint)0x14 + CPM_IRQ_OFFSET) | 394 | #define SIU_INT_IRQ2 ((uint)0x14 + CPM_IRQ_OFFSET) |
394 | #define SIU_INT_IRQ3 ((uint)0x15 + CPM_IRQ_OFFSET) | 395 | #define SIU_INT_IRQ3 ((uint)0x15 + CPM_IRQ_OFFSET) |
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index f6f186b56b0f..d12382d292d4 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h | |||
@@ -177,8 +177,8 @@ struct thread_struct { | |||
177 | #ifdef CONFIG_PPC64 | 177 | #ifdef CONFIG_PPC64 |
178 | unsigned long start_tb; /* Start purr when proc switched in */ | 178 | unsigned long start_tb; /* Start purr when proc switched in */ |
179 | unsigned long accum_tb; /* Total accumilated purr for process */ | 179 | unsigned long accum_tb; /* Total accumilated purr for process */ |
180 | unsigned long vdso_base; /* base of the vDSO library */ | ||
181 | #endif | 180 | #endif |
181 | unsigned long vdso_base; /* base of the vDSO library */ | ||
182 | unsigned long dabr; /* Data address breakpoint register */ | 182 | unsigned long dabr; /* Data address breakpoint register */ |
183 | #ifdef CONFIG_ALTIVEC | 183 | #ifdef CONFIG_ALTIVEC |
184 | /* Complete AltiVec register set */ | 184 | /* Complete AltiVec register set */ |
diff --git a/include/asm-powerpc/sparsemem.h b/include/asm-powerpc/sparsemem.h index 58d2aab416f8..ba1b34fdb967 100644 --- a/include/asm-powerpc/sparsemem.h +++ b/include/asm-powerpc/sparsemem.h | |||
@@ -8,8 +8,8 @@ | |||
8 | * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space | 8 | * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space |
9 | */ | 9 | */ |
10 | #define SECTION_SIZE_BITS 24 | 10 | #define SECTION_SIZE_BITS 24 |
11 | #define MAX_PHYSADDR_BITS 38 | 11 | #define MAX_PHYSADDR_BITS 44 |
12 | #define MAX_PHYSMEM_BITS 36 | 12 | #define MAX_PHYSMEM_BITS 44 |
13 | 13 | ||
14 | #ifdef CONFIG_MEMORY_HOTPLUG | 14 | #ifdef CONFIG_MEMORY_HOTPLUG |
15 | extern void create_section_mapping(unsigned long start, unsigned long end); | 15 | extern void create_section_mapping(unsigned long start, unsigned long end); |
diff --git a/include/asm-powerpc/systemcfg.h b/include/asm-powerpc/systemcfg.h deleted file mode 100644 index 36b5cbe466f1..000000000000 --- a/include/asm-powerpc/systemcfg.h +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | #ifndef _SYSTEMCFG_H | ||
2 | #define _SYSTEMCFG_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 2002 Peter Bergner <bergner@vnet.ibm.com>, IBM | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License | ||
9 | * as published by the Free Software Foundation; either version | ||
10 | * 2 of the License, or (at your option) any later version. | ||
11 | */ | ||
12 | |||
13 | /* Change Activity: | ||
14 | * 2002/09/30 : bergner : Created | ||
15 | * End Change Activity | ||
16 | */ | ||
17 | |||
18 | /* | ||
19 | * If the major version changes we are incompatible. | ||
20 | * Minor version changes are a hint. | ||
21 | */ | ||
22 | #define SYSTEMCFG_MAJOR 1 | ||
23 | #define SYSTEMCFG_MINOR 1 | ||
24 | |||
25 | #ifndef __ASSEMBLY__ | ||
26 | |||
27 | #include <linux/unistd.h> | ||
28 | |||
29 | #define SYSCALL_MAP_SIZE ((__NR_syscalls + 31) / 32) | ||
30 | |||
31 | struct systemcfg { | ||
32 | __u8 eye_catcher[16]; /* Eyecatcher: SYSTEMCFG:PPC64 0x00 */ | ||
33 | struct { /* Systemcfg version numbers */ | ||
34 | __u32 major; /* Major number 0x10 */ | ||
35 | __u32 minor; /* Minor number 0x14 */ | ||
36 | } version; | ||
37 | |||
38 | __u32 platform; /* Platform flags 0x18 */ | ||
39 | __u32 processor; /* Processor type 0x1C */ | ||
40 | __u64 processorCount; /* # of physical processors 0x20 */ | ||
41 | __u64 physicalMemorySize; /* Size of real memory(B) 0x28 */ | ||
42 | __u64 tb_orig_stamp; /* Timebase at boot 0x30 */ | ||
43 | __u64 tb_ticks_per_sec; /* Timebase tics / sec 0x38 */ | ||
44 | __u64 tb_to_xs; /* Inverse of TB to 2^20 0x40 */ | ||
45 | __u64 stamp_xsec; /* 0x48 */ | ||
46 | __u64 tb_update_count; /* Timebase atomicity ctr 0x50 */ | ||
47 | __u32 tz_minuteswest; /* Minutes west of Greenwich 0x58 */ | ||
48 | __u32 tz_dsttime; /* Type of dst correction 0x5C */ | ||
49 | /* next four are no longer used except to be exported to /proc */ | ||
50 | __u32 dcache_size; /* L1 d-cache size 0x60 */ | ||
51 | __u32 dcache_line_size; /* L1 d-cache line size 0x64 */ | ||
52 | __u32 icache_size; /* L1 i-cache size 0x68 */ | ||
53 | __u32 icache_line_size; /* L1 i-cache line size 0x6C */ | ||
54 | __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of available syscalls 0x70 */ | ||
55 | __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of available syscalls */ | ||
56 | }; | ||
57 | |||
58 | #ifdef __KERNEL__ | ||
59 | extern struct systemcfg *_systemcfg; /* to be renamed */ | ||
60 | #endif | ||
61 | |||
62 | #endif /* __ASSEMBLY__ */ | ||
63 | |||
64 | #endif /* _SYSTEMCFG_H */ | ||
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index 2512e3836bf4..015d28746e1b 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h | |||
@@ -9,15 +9,7 @@ | |||
9 | 9 | ||
10 | static inline int cpu_to_node(int cpu) | 10 | static inline int cpu_to_node(int cpu) |
11 | { | 11 | { |
12 | int node; | 12 | return numa_cpu_lookup_table[cpu]; |
13 | |||
14 | node = numa_cpu_lookup_table[cpu]; | ||
15 | |||
16 | #ifdef DEBUG_NUMA | ||
17 | BUG_ON(node == -1); | ||
18 | #endif | ||
19 | |||
20 | return node; | ||
21 | } | 13 | } |
22 | 14 | ||
23 | #define parent_node(node) (node) | 15 | #define parent_node(node) (node) |
@@ -37,8 +29,6 @@ static inline int node_to_first_cpu(int node) | |||
37 | #define pcibus_to_node(node) (-1) | 29 | #define pcibus_to_node(node) (-1) |
38 | #define pcibus_to_cpumask(bus) (cpu_online_map) | 30 | #define pcibus_to_cpumask(bus) (cpu_online_map) |
39 | 31 | ||
40 | #define nr_cpus_node(node) (nr_cpus_in_node[node]) | ||
41 | |||
42 | /* sched_domains SD_NODE_INIT for PPC64 machines */ | 32 | /* sched_domains SD_NODE_INIT for PPC64 machines */ |
43 | #define SD_NODE_INIT (struct sched_domain) { \ | 33 | #define SD_NODE_INIT (struct sched_domain) { \ |
44 | .span = CPU_MASK_NONE, \ | 34 | .span = CPU_MASK_NONE, \ |
diff --git a/include/asm-powerpc/udbg.h b/include/asm-powerpc/udbg.h new file mode 100644 index 000000000000..a383383bc4d4 --- /dev/null +++ b/include/asm-powerpc/udbg.h | |||
@@ -0,0 +1,31 @@ | |||
1 | /* | ||
2 | * c 2001 PPC 64 Team, IBM Corp | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version | ||
7 | * 2 of the License, or (at your option) any later version. | ||
8 | */ | ||
9 | |||
10 | #ifndef _ASM_POWERPC_UDBG_H | ||
11 | #define _ASM_POWERPC_UDBG_H | ||
12 | |||
13 | #include <linux/compiler.h> | ||
14 | #include <linux/init.h> | ||
15 | |||
16 | extern void (*udbg_putc)(unsigned char c); | ||
17 | extern unsigned char (*udbg_getc)(void); | ||
18 | extern int (*udbg_getc_poll)(void); | ||
19 | |||
20 | extern void udbg_puts(const char *s); | ||
21 | extern int udbg_write(const char *s, int n); | ||
22 | extern int udbg_read(char *buf, int buflen); | ||
23 | |||
24 | extern void register_early_udbg_console(void); | ||
25 | extern void udbg_printf(const char *fmt, ...); | ||
26 | |||
27 | extern void udbg_init_uart(void __iomem *comport, unsigned int speed); | ||
28 | |||
29 | struct device_node; | ||
30 | extern void udbg_init_scc(struct device_node *np); | ||
31 | #endif /* _ASM_POWERPC_UDBG_H */ | ||
diff --git a/include/asm-powerpc/vdso.h b/include/asm-powerpc/vdso.h new file mode 100644 index 000000000000..85d8a7be25c4 --- /dev/null +++ b/include/asm-powerpc/vdso.h | |||
@@ -0,0 +1,83 @@ | |||
1 | #ifndef __PPC64_VDSO_H__ | ||
2 | #define __PPC64_VDSO_H__ | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | /* Default link addresses for the vDSOs */ | ||
7 | #define VDSO32_LBASE 0x100000 | ||
8 | #define VDSO64_LBASE 0x100000 | ||
9 | |||
10 | /* Default map addresses */ | ||
11 | #define VDSO32_MBASE VDSO32_LBASE | ||
12 | #define VDSO64_MBASE VDSO64_LBASE | ||
13 | |||
14 | #define VDSO_VERSION_STRING LINUX_2.6.12 | ||
15 | |||
16 | /* Define if 64 bits VDSO has procedure descriptors */ | ||
17 | #undef VDS64_HAS_DESCRIPTORS | ||
18 | |||
19 | #ifndef __ASSEMBLY__ | ||
20 | |||
21 | extern unsigned int vdso64_pages; | ||
22 | extern unsigned int vdso32_pages; | ||
23 | |||
24 | /* Offsets relative to thread->vdso_base */ | ||
25 | extern unsigned long vdso64_rt_sigtramp; | ||
26 | extern unsigned long vdso32_sigtramp; | ||
27 | extern unsigned long vdso32_rt_sigtramp; | ||
28 | |||
29 | extern void vdso_init(void); | ||
30 | |||
31 | #else /* __ASSEMBLY__ */ | ||
32 | |||
33 | #ifdef __VDSO64__ | ||
34 | #ifdef VDS64_HAS_DESCRIPTORS | ||
35 | #define V_FUNCTION_BEGIN(name) \ | ||
36 | .globl name; \ | ||
37 | .section ".opd","a"; \ | ||
38 | .align 3; \ | ||
39 | name: \ | ||
40 | .quad .name,.TOC.@tocbase,0; \ | ||
41 | .previous; \ | ||
42 | .globl .name; \ | ||
43 | .type .name,@function; \ | ||
44 | .name: \ | ||
45 | |||
46 | #define V_FUNCTION_END(name) \ | ||
47 | .size .name,.-.name; | ||
48 | |||
49 | #define V_LOCAL_FUNC(name) (.name) | ||
50 | |||
51 | #else /* VDS64_HAS_DESCRIPTORS */ | ||
52 | |||
53 | #define V_FUNCTION_BEGIN(name) \ | ||
54 | .globl name; \ | ||
55 | name: \ | ||
56 | |||
57 | #define V_FUNCTION_END(name) \ | ||
58 | .size name,.-name; | ||
59 | |||
60 | #define V_LOCAL_FUNC(name) (name) | ||
61 | |||
62 | #endif /* VDS64_HAS_DESCRIPTORS */ | ||
63 | #endif /* __VDSO64__ */ | ||
64 | |||
65 | #ifdef __VDSO32__ | ||
66 | |||
67 | #define V_FUNCTION_BEGIN(name) \ | ||
68 | .globl name; \ | ||
69 | .type name,@function; \ | ||
70 | name: \ | ||
71 | |||
72 | #define V_FUNCTION_END(name) \ | ||
73 | .size name,.-name; | ||
74 | |||
75 | #define V_LOCAL_FUNC(name) (name) | ||
76 | |||
77 | #endif /* __VDSO32__ */ | ||
78 | |||
79 | #endif /* __ASSEMBLY__ */ | ||
80 | |||
81 | #endif /* __KERNEL__ */ | ||
82 | |||
83 | #endif /* __PPC64_VDSO_H__ */ | ||
diff --git a/include/asm-powerpc/vdso_datapage.h b/include/asm-powerpc/vdso_datapage.h new file mode 100644 index 000000000000..fc323b51366b --- /dev/null +++ b/include/asm-powerpc/vdso_datapage.h | |||
@@ -0,0 +1,108 @@ | |||
1 | #ifndef _VDSO_DATAPAGE_H | ||
2 | #define _VDSO_DATAPAGE_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 2002 Peter Bergner <bergner@vnet.ibm.com>, IBM | ||
6 | * Copyright (C) 2005 Benjamin Herrenschmidy <benh@kernel.crashing.org>, | ||
7 | * IBM Corp. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or | ||
10 | * modify it under the terms of the GNU General Public License | ||
11 | * as published by the Free Software Foundation; either version | ||
12 | * 2 of the License, or (at your option) any later version. | ||
13 | */ | ||
14 | |||
15 | |||
16 | /* | ||
17 | * Note about this structure: | ||
18 | * | ||
19 | * This structure was historically called systemcfg and exposed to | ||
20 | * userland via /proc/ppc64/systemcfg. Unfortunately, this became an | ||
21 | * ABI issue as some proprietary software started relying on being able | ||
22 | * to mmap() it, thus we have to keep the base layout at least for a | ||
23 | * few kernel versions. | ||
24 | * | ||
25 | * However, since ppc32 doesn't suffer from this backward handicap, | ||
26 | * a simpler version of the data structure is used there with only the | ||
27 | * fields actually used by the vDSO. | ||
28 | * | ||
29 | */ | ||
30 | |||
31 | /* | ||
32 | * If the major version changes we are incompatible. | ||
33 | * Minor version changes are a hint. | ||
34 | */ | ||
35 | #define SYSTEMCFG_MAJOR 1 | ||
36 | #define SYSTEMCFG_MINOR 1 | ||
37 | |||
38 | #ifndef __ASSEMBLY__ | ||
39 | |||
40 | #include <linux/unistd.h> | ||
41 | |||
42 | #define SYSCALL_MAP_SIZE ((__NR_syscalls + 31) / 32) | ||
43 | |||
44 | /* | ||
45 | * So here is the ppc64 backward compatible version | ||
46 | */ | ||
47 | |||
48 | #ifdef CONFIG_PPC64 | ||
49 | |||
50 | struct vdso_data { | ||
51 | __u8 eye_catcher[16]; /* Eyecatcher: SYSTEMCFG:PPC64 0x00 */ | ||
52 | struct { /* Systemcfg version numbers */ | ||
53 | __u32 major; /* Major number 0x10 */ | ||
54 | __u32 minor; /* Minor number 0x14 */ | ||
55 | } version; | ||
56 | |||
57 | __u32 platform; /* Platform flags 0x18 */ | ||
58 | __u32 processor; /* Processor type 0x1C */ | ||
59 | __u64 processorCount; /* # of physical processors 0x20 */ | ||
60 | __u64 physicalMemorySize; /* Size of real memory(B) 0x28 */ | ||
61 | __u64 tb_orig_stamp; /* Timebase at boot 0x30 */ | ||
62 | __u64 tb_ticks_per_sec; /* Timebase tics / sec 0x38 */ | ||
63 | __u64 tb_to_xs; /* Inverse of TB to 2^20 0x40 */ | ||
64 | __u64 stamp_xsec; /* 0x48 */ | ||
65 | __u64 tb_update_count; /* Timebase atomicity ctr 0x50 */ | ||
66 | __u32 tz_minuteswest; /* Minutes west of Greenwich 0x58 */ | ||
67 | __u32 tz_dsttime; /* Type of dst correction 0x5C */ | ||
68 | __u32 dcache_size; /* L1 d-cache size 0x60 */ | ||
69 | __u32 dcache_line_size; /* L1 d-cache line size 0x64 */ | ||
70 | __u32 icache_size; /* L1 i-cache size 0x68 */ | ||
71 | __u32 icache_line_size; /* L1 i-cache line size 0x6C */ | ||
72 | |||
73 | /* those additional ones don't have to be located anywhere | ||
74 | * special as they were not part of the original systemcfg | ||
75 | */ | ||
76 | __s64 wtom_clock_sec; /* Wall to monotonic clock */ | ||
77 | __s32 wtom_clock_nsec; | ||
78 | __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */ | ||
79 | __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ | ||
80 | }; | ||
81 | |||
82 | #else /* CONFIG_PPC64 */ | ||
83 | |||
84 | /* | ||
85 | * And here is the simpler 32 bits version | ||
86 | */ | ||
87 | struct vdso_data { | ||
88 | __u64 tb_orig_stamp; /* Timebase at boot 0x30 */ | ||
89 | __u64 tb_ticks_per_sec; /* Timebase tics / sec 0x38 */ | ||
90 | __u64 tb_to_xs; /* Inverse of TB to 2^20 0x40 */ | ||
91 | __u64 stamp_xsec; /* 0x48 */ | ||
92 | __u32 tb_update_count; /* Timebase atomicity ctr 0x50 */ | ||
93 | __u32 tz_minuteswest; /* Minutes west of Greenwich 0x58 */ | ||
94 | __u32 tz_dsttime; /* Type of dst correction 0x5C */ | ||
95 | __s32 wtom_clock_sec; /* Wall to monotonic clock */ | ||
96 | __s32 wtom_clock_nsec; | ||
97 | __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ | ||
98 | }; | ||
99 | |||
100 | #endif /* CONFIG_PPC64 */ | ||
101 | |||
102 | #ifdef __KERNEL__ | ||
103 | extern struct vdso_data *vdso_data; | ||
104 | #endif | ||
105 | |||
106 | #endif /* __ASSEMBLY__ */ | ||
107 | |||
108 | #endif /* _SYSTEMCFG_H */ | ||