diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /include/asm-powerpc | |
parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-powerpc')
26 files changed, 1774 insertions, 701 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index b2e56b30306a..870967e47204 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
29 | #include <asm/machdep.h> | ||
29 | #include <asm/types.h> | 30 | #include <asm/types.h> |
30 | #include <asm/bitops.h> | 31 | #include <asm/bitops.h> |
31 | 32 | ||
@@ -109,6 +110,19 @@ static inline void pci_iommu_init(void) { } | |||
109 | #endif | 110 | #endif |
110 | 111 | ||
111 | extern void alloc_dart_table(void); | 112 | extern void alloc_dart_table(void); |
113 | #if defined(CONFIG_PPC64) && defined(CONFIG_PM) | ||
114 | static inline void iommu_save(void) | ||
115 | { | ||
116 | if (ppc_md.iommu_save) | ||
117 | ppc_md.iommu_save(); | ||
118 | } | ||
119 | |||
120 | static inline void iommu_restore(void) | ||
121 | { | ||
122 | if (ppc_md.iommu_restore) | ||
123 | ppc_md.iommu_restore(); | ||
124 | } | ||
125 | #endif | ||
112 | 126 | ||
113 | #endif /* __KERNEL__ */ | 127 | #endif /* __KERNEL__ */ |
114 | #endif /* _ASM_IOMMU_H */ | 128 | #endif /* _ASM_IOMMU_H */ |
diff --git a/include/asm-powerpc/kdebug.h b/include/asm-powerpc/kdebug.h index 1c73d2ec9b59..295f0162c608 100644 --- a/include/asm-powerpc/kdebug.h +++ b/include/asm-powerpc/kdebug.h | |||
@@ -6,8 +6,19 @@ | |||
6 | 6 | ||
7 | #include <linux/notifier.h> | 7 | #include <linux/notifier.h> |
8 | 8 | ||
9 | extern int register_page_fault_notifier(struct notifier_block *); | 9 | /* |
10 | extern int unregister_page_fault_notifier(struct notifier_block *); | 10 | * These are only here because kprobes.c wants them to implement a |
11 | * blatant layering violation. Will hopefully go away soon once all | ||
12 | * architectures are updated. | ||
13 | */ | ||
14 | static inline int register_page_fault_notifier(struct notifier_block *nb) | ||
15 | { | ||
16 | return 0; | ||
17 | } | ||
18 | static inline int unregister_page_fault_notifier(struct notifier_block *nb) | ||
19 | { | ||
20 | return 0; | ||
21 | } | ||
11 | extern struct atomic_notifier_head powerpc_die_chain; | 22 | extern struct atomic_notifier_head powerpc_die_chain; |
12 | 23 | ||
13 | /* Grossly misnamed. */ | 24 | /* Grossly misnamed. */ |
@@ -17,7 +28,6 @@ enum die_val { | |||
17 | DIE_DABR_MATCH, | 28 | DIE_DABR_MATCH, |
18 | DIE_BPT, | 29 | DIE_BPT, |
19 | DIE_SSTEP, | 30 | DIE_SSTEP, |
20 | DIE_PAGE_FAULT, | ||
21 | }; | 31 | }; |
22 | 32 | ||
23 | #endif /* __KERNEL__ */ | 33 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h index f850ca7020ed..b0e40ff32ee0 100644 --- a/include/asm-powerpc/kprobes.h +++ b/include/asm-powerpc/kprobes.h | |||
@@ -64,6 +64,12 @@ typedef unsigned int kprobe_opcode_t; | |||
64 | addr = *(kprobe_opcode_t **)addr; \ | 64 | addr = *(kprobe_opcode_t **)addr; \ |
65 | } else if (name[0] != '.') \ | 65 | } else if (name[0] != '.') \ |
66 | addr = *(kprobe_opcode_t **)addr; \ | 66 | addr = *(kprobe_opcode_t **)addr; \ |
67 | } else { \ | ||
68 | char dot_name[KSYM_NAME_LEN+1]; \ | ||
69 | dot_name[0] = '.'; \ | ||
70 | dot_name[1] = '\0'; \ | ||
71 | strncat(dot_name, name, KSYM_NAME_LEN); \ | ||
72 | addr = (kprobe_opcode_t *)kallsyms_lookup_name(dot_name); \ | ||
67 | } \ | 73 | } \ |
68 | } | 74 | } |
69 | 75 | ||
@@ -110,5 +116,6 @@ struct kprobe_ctlblk { | |||
110 | 116 | ||
111 | extern int kprobe_exceptions_notify(struct notifier_block *self, | 117 | extern int kprobe_exceptions_notify(struct notifier_block *self, |
112 | unsigned long val, void *data); | 118 | unsigned long val, void *data); |
119 | extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); | ||
113 | #endif /* __KERNEL__ */ | 120 | #endif /* __KERNEL__ */ |
114 | #endif /* _ASM_POWERPC_KPROBES_H */ | 121 | #endif /* _ASM_POWERPC_KPROBES_H */ |
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index b204926ce913..6cf1a831f550 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h | |||
@@ -91,6 +91,11 @@ struct machdep_calls { | |||
91 | void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, | 91 | void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, |
92 | unsigned long flags); | 92 | unsigned long flags); |
93 | void (*iounmap)(volatile void __iomem *token); | 93 | void (*iounmap)(volatile void __iomem *token); |
94 | |||
95 | #ifdef CONFIG_PM | ||
96 | void (*iommu_save)(void); | ||
97 | void (*iommu_restore)(void); | ||
98 | #endif | ||
94 | #endif /* CONFIG_PPC64 */ | 99 | #endif /* CONFIG_PPC64 */ |
95 | 100 | ||
96 | int (*probe)(void); | 101 | int (*probe)(void); |
@@ -115,6 +120,14 @@ struct machdep_calls { | |||
115 | /* To setup PHBs when using automatic OF platform driver for PCI */ | 120 | /* To setup PHBs when using automatic OF platform driver for PCI */ |
116 | int (*pci_setup_phb)(struct pci_controller *host); | 121 | int (*pci_setup_phb)(struct pci_controller *host); |
117 | 122 | ||
123 | #ifdef CONFIG_PCI_MSI | ||
124 | int (*msi_check_device)(struct pci_dev* dev, | ||
125 | int nvec, int type); | ||
126 | int (*setup_msi_irqs)(struct pci_dev *dev, | ||
127 | int nvec, int type); | ||
128 | void (*teardown_msi_irqs)(struct pci_dev *dev); | ||
129 | #endif | ||
130 | |||
118 | void (*restart)(char *cmd); | 131 | void (*restart)(char *cmd); |
119 | void (*power_off)(void); | 132 | void (*power_off)(void); |
120 | void (*halt)(void); | 133 | void (*halt)(void); |
@@ -240,14 +253,10 @@ struct machdep_calls { | |||
240 | */ | 253 | */ |
241 | void (*machine_kexec)(struct kimage *image); | 254 | void (*machine_kexec)(struct kimage *image); |
242 | #endif /* CONFIG_KEXEC */ | 255 | #endif /* CONFIG_KEXEC */ |
243 | |||
244 | #ifdef CONFIG_PCI_MSI | ||
245 | int (*enable_msi)(struct pci_dev *pdev); | ||
246 | void (*disable_msi)(struct pci_dev *pdev); | ||
247 | #endif /* CONFIG_PCI_MSI */ | ||
248 | }; | 256 | }; |
249 | 257 | ||
250 | extern void power4_idle(void); | 258 | extern void power4_idle(void); |
259 | extern void power4_cpu_offline_powersave(void); | ||
251 | extern void ppc6xx_idle(void); | 260 | extern void ppc6xx_idle(void); |
252 | 261 | ||
253 | /* | 262 | /* |
diff --git a/include/asm-powerpc/mmu-44x.h b/include/asm-powerpc/mmu-44x.h new file mode 100644 index 000000000000..d5ce7a8dfe9f --- /dev/null +++ b/include/asm-powerpc/mmu-44x.h | |||
@@ -0,0 +1,78 @@ | |||
1 | #ifndef _ASM_POWERPC_MMU_44X_H_ | ||
2 | #define _ASM_POWERPC_MMU_44X_H_ | ||
3 | /* | ||
4 | * PPC440 support | ||
5 | */ | ||
6 | |||
7 | #define PPC44x_MMUCR_TID 0x000000ff | ||
8 | #define PPC44x_MMUCR_STS 0x00010000 | ||
9 | |||
10 | #define PPC44x_TLB_PAGEID 0 | ||
11 | #define PPC44x_TLB_XLAT 1 | ||
12 | #define PPC44x_TLB_ATTRIB 2 | ||
13 | |||
14 | /* Page identification fields */ | ||
15 | #define PPC44x_TLB_EPN_MASK 0xfffffc00 /* Effective Page Number */ | ||
16 | #define PPC44x_TLB_VALID 0x00000200 /* Valid flag */ | ||
17 | #define PPC44x_TLB_TS 0x00000100 /* Translation address space */ | ||
18 | #define PPC44x_TLB_1K 0x00000000 /* Page sizes */ | ||
19 | #define PPC44x_TLB_4K 0x00000010 | ||
20 | #define PPC44x_TLB_16K 0x00000020 | ||
21 | #define PPC44x_TLB_64K 0x00000030 | ||
22 | #define PPC44x_TLB_256K 0x00000040 | ||
23 | #define PPC44x_TLB_1M 0x00000050 | ||
24 | #define PPC44x_TLB_16M 0x00000070 | ||
25 | #define PPC44x_TLB_256M 0x00000090 | ||
26 | |||
27 | /* Translation fields */ | ||
28 | #define PPC44x_TLB_RPN_MASK 0xfffffc00 /* Real Page Number */ | ||
29 | #define PPC44x_TLB_ERPN_MASK 0x0000000f | ||
30 | |||
31 | /* Storage attribute and access control fields */ | ||
32 | #define PPC44x_TLB_ATTR_MASK 0x0000ff80 | ||
33 | #define PPC44x_TLB_U0 0x00008000 /* User 0 */ | ||
34 | #define PPC44x_TLB_U1 0x00004000 /* User 1 */ | ||
35 | #define PPC44x_TLB_U2 0x00002000 /* User 2 */ | ||
36 | #define PPC44x_TLB_U3 0x00001000 /* User 3 */ | ||
37 | #define PPC44x_TLB_W 0x00000800 /* Caching is write-through */ | ||
38 | #define PPC44x_TLB_I 0x00000400 /* Caching is inhibited */ | ||
39 | #define PPC44x_TLB_M 0x00000200 /* Memory is coherent */ | ||
40 | #define PPC44x_TLB_G 0x00000100 /* Memory is guarded */ | ||
41 | #define PPC44x_TLB_E 0x00000080 /* Memory is guarded */ | ||
42 | |||
43 | #define PPC44x_TLB_PERM_MASK 0x0000003f | ||
44 | #define PPC44x_TLB_UX 0x00000020 /* User execution */ | ||
45 | #define PPC44x_TLB_UW 0x00000010 /* User write */ | ||
46 | #define PPC44x_TLB_UR 0x00000008 /* User read */ | ||
47 | #define PPC44x_TLB_SX 0x00000004 /* Super execution */ | ||
48 | #define PPC44x_TLB_SW 0x00000002 /* Super write */ | ||
49 | #define PPC44x_TLB_SR 0x00000001 /* Super read */ | ||
50 | |||
51 | /* Number of TLB entries */ | ||
52 | #define PPC44x_TLB_SIZE 64 | ||
53 | |||
54 | #ifndef __ASSEMBLY__ | ||
55 | |||
56 | typedef unsigned long long phys_addr_t; | ||
57 | |||
58 | extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); | ||
59 | |||
60 | typedef struct { | ||
61 | unsigned long id; | ||
62 | unsigned long vdso_base; | ||
63 | } mm_context_t; | ||
64 | |||
65 | #endif /* !__ASSEMBLY__ */ | ||
66 | |||
67 | #ifndef CONFIG_PPC_EARLY_DEBUG_44x | ||
68 | #define PPC44x_EARLY_TLBS 1 | ||
69 | #else | ||
70 | #define PPC44x_EARLY_TLBS 2 | ||
71 | #define PPC44x_EARLY_DEBUG_VIRTADDR (ASM_CONST(0xf0000000) \ | ||
72 | | (ASM_CONST(CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW) & 0xffff)) | ||
73 | #endif | ||
74 | |||
75 | /* Size of the TLBs used for pinning in lowmem */ | ||
76 | #define PPC_PIN_SIZE (1 << 28) /* 256M */ | ||
77 | |||
78 | #endif /* _ASM_POWERPC_MMU_44X_H_ */ | ||
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index 06b3e6d336cb..fe510fff8907 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
@@ -5,9 +5,12 @@ | |||
5 | #ifdef CONFIG_PPC64 | 5 | #ifdef CONFIG_PPC64 |
6 | /* 64-bit classic hash table MMU */ | 6 | /* 64-bit classic hash table MMU */ |
7 | # include <asm/mmu-hash64.h> | 7 | # include <asm/mmu-hash64.h> |
8 | #elif defined(CONFIG_44x) | ||
9 | /* 44x-style software loaded TLB */ | ||
10 | # include <asm/mmu-44x.h> | ||
8 | #else | 11 | #else |
9 | /* 32-bit. FIXME: split up the 32-bit MMU types, and revise for | 12 | /* Other 32-bit. FIXME: split up the other 32-bit MMU types, and |
10 | * arch/powerpc */ | 13 | * revise for arch/powerpc */ |
11 | # include <asm-ppc/mmu.h> | 14 | # include <asm-ppc/mmu.h> |
12 | #endif | 15 | #endif |
13 | 16 | ||
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 7afd5bf94528..c4631f6dd4f9 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h | |||
@@ -253,5 +253,16 @@ extern int __init mpc52xx_add_bridge(struct device_node *node); | |||
253 | 253 | ||
254 | #endif /* __ASSEMBLY__ */ | 254 | #endif /* __ASSEMBLY__ */ |
255 | 255 | ||
256 | #ifdef CONFIG_PM | ||
257 | struct mpc52xx_suspend { | ||
258 | void (*board_suspend_prepare)(void __iomem *mbar); | ||
259 | void (*board_resume_finish)(void __iomem *mbar); | ||
260 | }; | ||
261 | |||
262 | extern struct mpc52xx_suspend mpc52xx_suspend; | ||
263 | extern int __init mpc52xx_pm_init(void); | ||
264 | extern int mpc52xx_set_wakeup_gpio(u8 pin, u8 level); | ||
265 | #endif /* CONFIG_PM */ | ||
266 | |||
256 | #endif /* __ASM_POWERPC_MPC52xx_H__ */ | 267 | #endif /* __ASM_POWERPC_MPC52xx_H__ */ |
257 | 268 | ||
diff --git a/include/asm-powerpc/mpic.h b/include/asm-powerpc/mpic.h index e4d5fc5362a0..2ffb06abe881 100644 --- a/include/asm-powerpc/mpic.h +++ b/include/asm-powerpc/mpic.h | |||
@@ -3,6 +3,7 @@ | |||
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | 4 | ||
5 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
6 | #include <linux/sysdev.h> | ||
6 | #include <asm/dcr.h> | 7 | #include <asm/dcr.h> |
7 | 8 | ||
8 | /* | 9 | /* |
@@ -228,6 +229,14 @@ struct mpic_reg_bank { | |||
228 | #endif /* CONFIG_PPC_DCR */ | 229 | #endif /* CONFIG_PPC_DCR */ |
229 | }; | 230 | }; |
230 | 231 | ||
232 | struct mpic_irq_save { | ||
233 | u32 vecprio, | ||
234 | dest; | ||
235 | #ifdef CONFIG_MPIC_U3_HT_IRQS | ||
236 | u32 fixup_data; | ||
237 | #endif | ||
238 | }; | ||
239 | |||
231 | /* The instance data of a given MPIC */ | 240 | /* The instance data of a given MPIC */ |
232 | struct mpic | 241 | struct mpic |
233 | { | 242 | { |
@@ -292,8 +301,19 @@ struct mpic | |||
292 | u32 *hw_set; | 301 | u32 *hw_set; |
293 | #endif | 302 | #endif |
294 | 303 | ||
304 | #ifdef CONFIG_PCI_MSI | ||
305 | spinlock_t bitmap_lock; | ||
306 | unsigned long *hwirq_bitmap; | ||
307 | #endif | ||
308 | |||
295 | /* link */ | 309 | /* link */ |
296 | struct mpic *next; | 310 | struct mpic *next; |
311 | |||
312 | struct sys_device sysdev; | ||
313 | |||
314 | #ifdef CONFIG_PM | ||
315 | struct mpic_irq_save *save_data; | ||
316 | #endif | ||
297 | }; | 317 | }; |
298 | 318 | ||
299 | /* | 319 | /* |
diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h index 4f1aabe0ce73..e9af49eb1aa8 100644 --- a/include/asm-powerpc/of_device.h +++ b/include/asm-powerpc/of_device.h | |||
@@ -32,6 +32,8 @@ extern int of_device_register(struct of_device *ofdev); | |||
32 | extern void of_device_unregister(struct of_device *ofdev); | 32 | extern void of_device_unregister(struct of_device *ofdev); |
33 | extern void of_release_dev(struct device *dev); | 33 | extern void of_release_dev(struct device *dev); |
34 | 34 | ||
35 | extern ssize_t of_device_get_modalias(struct of_device *ofdev, | ||
36 | char *str, ssize_t len); | ||
35 | extern int of_device_uevent(struct device *dev, | 37 | extern int of_device_uevent(struct device *dev, |
36 | char **envp, int num_envp, char *buffer, int buffer_size); | 38 | char **envp, int num_envp, char *buffer, int buffer_size); |
37 | 39 | ||
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index b4d38b0b15f8..10c51f457d48 100644 --- a/include/asm-powerpc/page.h +++ b/include/asm-powerpc/page.h | |||
@@ -121,6 +121,7 @@ typedef struct { pte_t pte; } real_pte_t; | |||
121 | #endif | 121 | #endif |
122 | 122 | ||
123 | /* PMD level */ | 123 | /* PMD level */ |
124 | #ifdef CONFIG_PPC64 | ||
124 | typedef struct { unsigned long pmd; } pmd_t; | 125 | typedef struct { unsigned long pmd; } pmd_t; |
125 | #define pmd_val(x) ((x).pmd) | 126 | #define pmd_val(x) ((x).pmd) |
126 | #define __pmd(x) ((pmd_t) { (x) }) | 127 | #define __pmd(x) ((pmd_t) { (x) }) |
@@ -130,7 +131,8 @@ typedef struct { unsigned long pmd; } pmd_t; | |||
130 | typedef struct { unsigned long pud; } pud_t; | 131 | typedef struct { unsigned long pud; } pud_t; |
131 | #define pud_val(x) ((x).pud) | 132 | #define pud_val(x) ((x).pud) |
132 | #define __pud(x) ((pud_t) { (x) }) | 133 | #define __pud(x) ((pud_t) { (x) }) |
133 | #endif | 134 | #endif /* !CONFIG_PPC_64K_PAGES */ |
135 | #endif /* CONFIG_PPC64 */ | ||
134 | 136 | ||
135 | /* PGD level */ | 137 | /* PGD level */ |
136 | typedef struct { unsigned long pgd; } pgd_t; | 138 | typedef struct { unsigned long pgd; } pgd_t; |
@@ -159,15 +161,17 @@ typedef unsigned long real_pte_t; | |||
159 | #endif | 161 | #endif |
160 | 162 | ||
161 | 163 | ||
164 | #ifdef CONFIG_PPC64 | ||
162 | typedef unsigned long pmd_t; | 165 | typedef unsigned long pmd_t; |
163 | #define pmd_val(x) (x) | 166 | #define pmd_val(x) (x) |
164 | #define __pmd(x) (x) | 167 | #define __pmd(x) (x) |
165 | 168 | ||
166 | #if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_64K_PAGES) | 169 | #ifndef CONFIG_PPC_64K_PAGES |
167 | typedef unsigned long pud_t; | 170 | typedef unsigned long pud_t; |
168 | #define pud_val(x) (x) | 171 | #define pud_val(x) (x) |
169 | #define __pud(x) (x) | 172 | #define __pud(x) (x) |
170 | #endif | 173 | #endif /* !CONFIG_PPC_64K_PAGES */ |
174 | #endif /* CONFIG_PPC64 */ | ||
171 | 175 | ||
172 | typedef unsigned long pgd_t; | 176 | typedef unsigned long pgd_t; |
173 | #define pgd_val(x) (x) | 177 | #define pgd_val(x) (x) |
diff --git a/include/asm-powerpc/page_32.h b/include/asm-powerpc/page_32.h index 07f6d3cf5e5a..374d0db37e1c 100644 --- a/include/asm-powerpc/page_32.h +++ b/include/asm-powerpc/page_32.h | |||
@@ -14,11 +14,9 @@ | |||
14 | #ifdef CONFIG_PTE_64BIT | 14 | #ifdef CONFIG_PTE_64BIT |
15 | typedef unsigned long long pte_basic_t; | 15 | typedef unsigned long long pte_basic_t; |
16 | #define PTE_SHIFT (PAGE_SHIFT - 3) /* 512 ptes per page */ | 16 | #define PTE_SHIFT (PAGE_SHIFT - 3) /* 512 ptes per page */ |
17 | #define PTE_FMT "%16Lx" | ||
18 | #else | 17 | #else |
19 | typedef unsigned long pte_basic_t; | 18 | typedef unsigned long pte_basic_t; |
20 | #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */ | 19 | #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */ |
21 | #define PTE_FMT "%.8lx" | ||
22 | #endif | 20 | #endif |
23 | 21 | ||
24 | struct page; | 22 | struct page; |
diff --git a/include/asm-powerpc/pgalloc-32.h b/include/asm-powerpc/pgalloc-32.h new file mode 100644 index 000000000000..e1307432163c --- /dev/null +++ b/include/asm-powerpc/pgalloc-32.h | |||
@@ -0,0 +1,41 @@ | |||
1 | #ifndef _ASM_POWERPC_PGALLOC_32_H | ||
2 | #define _ASM_POWERPC_PGALLOC_32_H | ||
3 | |||
4 | #include <linux/threads.h> | ||
5 | |||
6 | extern void __bad_pte(pmd_t *pmd); | ||
7 | |||
8 | extern pgd_t *pgd_alloc(struct mm_struct *mm); | ||
9 | extern void pgd_free(pgd_t *pgd); | ||
10 | |||
11 | /* | ||
12 | * We don't have any real pmd's, and this code never triggers because | ||
13 | * the pgd will always be present.. | ||
14 | */ | ||
15 | /* #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) */ | ||
16 | #define pmd_free(x) do { } while (0) | ||
17 | #define __pmd_free_tlb(tlb,x) do { } while (0) | ||
18 | /* #define pgd_populate(mm, pmd, pte) BUG() */ | ||
19 | |||
20 | #ifndef CONFIG_BOOKE | ||
21 | #define pmd_populate_kernel(mm, pmd, pte) \ | ||
22 | (pmd_val(*(pmd)) = __pa(pte) | _PMD_PRESENT) | ||
23 | #define pmd_populate(mm, pmd, pte) \ | ||
24 | (pmd_val(*(pmd)) = (page_to_pfn(pte) << PAGE_SHIFT) | _PMD_PRESENT) | ||
25 | #else | ||
26 | #define pmd_populate_kernel(mm, pmd, pte) \ | ||
27 | (pmd_val(*(pmd)) = (unsigned long)pte | _PMD_PRESENT) | ||
28 | #define pmd_populate(mm, pmd, pte) \ | ||
29 | (pmd_val(*(pmd)) = (unsigned long)lowmem_page_address(pte) | _PMD_PRESENT) | ||
30 | #endif | ||
31 | |||
32 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); | ||
33 | extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); | ||
34 | extern void pte_free_kernel(pte_t *pte); | ||
35 | extern void pte_free(struct page *pte); | ||
36 | |||
37 | #define __pte_free_tlb(tlb, pte) pte_free((pte)) | ||
38 | |||
39 | #define check_pgt_cache() do { } while (0) | ||
40 | |||
41 | #endif /* _ASM_POWERPC_PGALLOC_32_H */ | ||
diff --git a/include/asm-powerpc/pgalloc-64.h b/include/asm-powerpc/pgalloc-64.h new file mode 100644 index 000000000000..30b50cf56e2c --- /dev/null +++ b/include/asm-powerpc/pgalloc-64.h | |||
@@ -0,0 +1,152 @@ | |||
1 | #ifndef _ASM_POWERPC_PGALLOC_64_H | ||
2 | #define _ASM_POWERPC_PGALLOC_64_H | ||
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 | #include <linux/mm.h> | ||
11 | #include <linux/slab.h> | ||
12 | #include <linux/cpumask.h> | ||
13 | #include <linux/percpu.h> | ||
14 | |||
15 | extern struct kmem_cache *pgtable_cache[]; | ||
16 | |||
17 | #ifdef CONFIG_PPC_64K_PAGES | ||
18 | #define PTE_CACHE_NUM 0 | ||
19 | #define PMD_CACHE_NUM 1 | ||
20 | #define PGD_CACHE_NUM 2 | ||
21 | #define HUGEPTE_CACHE_NUM 3 | ||
22 | #else | ||
23 | #define PTE_CACHE_NUM 0 | ||
24 | #define PMD_CACHE_NUM 1 | ||
25 | #define PUD_CACHE_NUM 1 | ||
26 | #define PGD_CACHE_NUM 0 | ||
27 | #define HUGEPTE_CACHE_NUM 2 | ||
28 | #endif | ||
29 | |||
30 | static inline pgd_t *pgd_alloc(struct mm_struct *mm) | ||
31 | { | ||
32 | return kmem_cache_alloc(pgtable_cache[PGD_CACHE_NUM], GFP_KERNEL); | ||
33 | } | ||
34 | |||
35 | static inline void pgd_free(pgd_t *pgd) | ||
36 | { | ||
37 | kmem_cache_free(pgtable_cache[PGD_CACHE_NUM], pgd); | ||
38 | } | ||
39 | |||
40 | #ifndef CONFIG_PPC_64K_PAGES | ||
41 | |||
42 | #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD) | ||
43 | |||
44 | static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) | ||
45 | { | ||
46 | return kmem_cache_alloc(pgtable_cache[PUD_CACHE_NUM], | ||
47 | GFP_KERNEL|__GFP_REPEAT); | ||
48 | } | ||
49 | |||
50 | static inline void pud_free(pud_t *pud) | ||
51 | { | ||
52 | kmem_cache_free(pgtable_cache[PUD_CACHE_NUM], pud); | ||
53 | } | ||
54 | |||
55 | static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) | ||
56 | { | ||
57 | pud_set(pud, (unsigned long)pmd); | ||
58 | } | ||
59 | |||
60 | #define pmd_populate(mm, pmd, pte_page) \ | ||
61 | pmd_populate_kernel(mm, pmd, page_address(pte_page)) | ||
62 | #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte)) | ||
63 | |||
64 | |||
65 | #else /* CONFIG_PPC_64K_PAGES */ | ||
66 | |||
67 | #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd) | ||
68 | |||
69 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, | ||
70 | pte_t *pte) | ||
71 | { | ||
72 | pmd_set(pmd, (unsigned long)pte); | ||
73 | } | ||
74 | |||
75 | #define pmd_populate(mm, pmd, pte_page) \ | ||
76 | pmd_populate_kernel(mm, pmd, page_address(pte_page)) | ||
77 | |||
78 | #endif /* CONFIG_PPC_64K_PAGES */ | ||
79 | |||
80 | static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) | ||
81 | { | ||
82 | return kmem_cache_alloc(pgtable_cache[PMD_CACHE_NUM], | ||
83 | GFP_KERNEL|__GFP_REPEAT); | ||
84 | } | ||
85 | |||
86 | static inline void pmd_free(pmd_t *pmd) | ||
87 | { | ||
88 | kmem_cache_free(pgtable_cache[PMD_CACHE_NUM], pmd); | ||
89 | } | ||
90 | |||
91 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | ||
92 | unsigned long address) | ||
93 | { | ||
94 | return kmem_cache_alloc(pgtable_cache[PTE_CACHE_NUM], | ||
95 | GFP_KERNEL|__GFP_REPEAT); | ||
96 | } | ||
97 | |||
98 | static inline struct page *pte_alloc_one(struct mm_struct *mm, | ||
99 | unsigned long address) | ||
100 | { | ||
101 | return virt_to_page(pte_alloc_one_kernel(mm, address)); | ||
102 | } | ||
103 | |||
104 | static inline void pte_free_kernel(pte_t *pte) | ||
105 | { | ||
106 | kmem_cache_free(pgtable_cache[PTE_CACHE_NUM], pte); | ||
107 | } | ||
108 | |||
109 | static inline void pte_free(struct page *ptepage) | ||
110 | { | ||
111 | pte_free_kernel(page_address(ptepage)); | ||
112 | } | ||
113 | |||
114 | #define PGF_CACHENUM_MASK 0x3 | ||
115 | |||
116 | typedef struct pgtable_free { | ||
117 | unsigned long val; | ||
118 | } pgtable_free_t; | ||
119 | |||
120 | static inline pgtable_free_t pgtable_free_cache(void *p, int cachenum, | ||
121 | unsigned long mask) | ||
122 | { | ||
123 | BUG_ON(cachenum > PGF_CACHENUM_MASK); | ||
124 | |||
125 | return (pgtable_free_t){.val = ((unsigned long) p & ~mask) | cachenum}; | ||
126 | } | ||
127 | |||
128 | static inline void pgtable_free(pgtable_free_t pgf) | ||
129 | { | ||
130 | void *p = (void *)(pgf.val & ~PGF_CACHENUM_MASK); | ||
131 | int cachenum = pgf.val & PGF_CACHENUM_MASK; | ||
132 | |||
133 | kmem_cache_free(pgtable_cache[cachenum], p); | ||
134 | } | ||
135 | |||
136 | extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); | ||
137 | |||
138 | #define __pte_free_tlb(tlb, ptepage) \ | ||
139 | pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ | ||
140 | PTE_CACHE_NUM, PTE_TABLE_SIZE-1)) | ||
141 | #define __pmd_free_tlb(tlb, pmd) \ | ||
142 | pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \ | ||
143 | PMD_CACHE_NUM, PMD_TABLE_SIZE-1)) | ||
144 | #ifndef CONFIG_PPC_64K_PAGES | ||
145 | #define __pud_free_tlb(tlb, pud) \ | ||
146 | pgtable_free_tlb(tlb, pgtable_free_cache(pud, \ | ||
147 | PUD_CACHE_NUM, PUD_TABLE_SIZE-1)) | ||
148 | #endif /* CONFIG_PPC_64K_PAGES */ | ||
149 | |||
150 | #define check_pgt_cache() do { } while (0) | ||
151 | |||
152 | #endif /* _ASM_POWERPC_PGALLOC_64_H */ | ||
diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h index b0830db68f8a..b4505ed0f0f2 100644 --- a/include/asm-powerpc/pgalloc.h +++ b/include/asm-powerpc/pgalloc.h | |||
@@ -2,159 +2,11 @@ | |||
2 | #define _ASM_POWERPC_PGALLOC_H | 2 | #define _ASM_POWERPC_PGALLOC_H |
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | 4 | ||
5 | #ifndef CONFIG_PPC64 | 5 | #ifdef CONFIG_PPC64 |
6 | #include <asm-ppc/pgalloc.h> | 6 | #include <asm/pgalloc-64.h> |
7 | #else | 7 | #else |
8 | 8 | #include <asm/pgalloc-32.h> | |
9 | #include <linux/mm.h> | ||
10 | #include <linux/slab.h> | ||
11 | #include <linux/cpumask.h> | ||
12 | #include <linux/percpu.h> | ||
13 | |||
14 | extern struct kmem_cache *pgtable_cache[]; | ||
15 | |||
16 | #ifdef CONFIG_PPC_64K_PAGES | ||
17 | #define PTE_CACHE_NUM 0 | ||
18 | #define PMD_CACHE_NUM 1 | ||
19 | #define PGD_CACHE_NUM 2 | ||
20 | #define HUGEPTE_CACHE_NUM 3 | ||
21 | #else | ||
22 | #define PTE_CACHE_NUM 0 | ||
23 | #define PMD_CACHE_NUM 1 | ||
24 | #define PUD_CACHE_NUM 1 | ||
25 | #define PGD_CACHE_NUM 0 | ||
26 | #define HUGEPTE_CACHE_NUM 2 | ||
27 | #endif | 9 | #endif |
28 | 10 | ||
29 | /* | ||
30 | * This program is free software; you can redistribute it and/or | ||
31 | * modify it under the terms of the GNU General Public License | ||
32 | * as published by the Free Software Foundation; either version | ||
33 | * 2 of the License, or (at your option) any later version. | ||
34 | */ | ||
35 | |||
36 | static inline pgd_t *pgd_alloc(struct mm_struct *mm) | ||
37 | { | ||
38 | return kmem_cache_alloc(pgtable_cache[PGD_CACHE_NUM], GFP_KERNEL); | ||
39 | } | ||
40 | |||
41 | static inline void pgd_free(pgd_t *pgd) | ||
42 | { | ||
43 | kmem_cache_free(pgtable_cache[PGD_CACHE_NUM], pgd); | ||
44 | } | ||
45 | |||
46 | #ifndef CONFIG_PPC_64K_PAGES | ||
47 | |||
48 | #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD) | ||
49 | |||
50 | static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) | ||
51 | { | ||
52 | return kmem_cache_alloc(pgtable_cache[PUD_CACHE_NUM], | ||
53 | GFP_KERNEL|__GFP_REPEAT); | ||
54 | } | ||
55 | |||
56 | static inline void pud_free(pud_t *pud) | ||
57 | { | ||
58 | kmem_cache_free(pgtable_cache[PUD_CACHE_NUM], pud); | ||
59 | } | ||
60 | |||
61 | static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) | ||
62 | { | ||
63 | pud_set(pud, (unsigned long)pmd); | ||
64 | } | ||
65 | |||
66 | #define pmd_populate(mm, pmd, pte_page) \ | ||
67 | pmd_populate_kernel(mm, pmd, page_address(pte_page)) | ||
68 | #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte)) | ||
69 | |||
70 | |||
71 | #else /* CONFIG_PPC_64K_PAGES */ | ||
72 | |||
73 | #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd) | ||
74 | |||
75 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, | ||
76 | pte_t *pte) | ||
77 | { | ||
78 | pmd_set(pmd, (unsigned long)pte); | ||
79 | } | ||
80 | |||
81 | #define pmd_populate(mm, pmd, pte_page) \ | ||
82 | pmd_populate_kernel(mm, pmd, page_address(pte_page)) | ||
83 | |||
84 | #endif /* CONFIG_PPC_64K_PAGES */ | ||
85 | |||
86 | static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) | ||
87 | { | ||
88 | return kmem_cache_alloc(pgtable_cache[PMD_CACHE_NUM], | ||
89 | GFP_KERNEL|__GFP_REPEAT); | ||
90 | } | ||
91 | |||
92 | static inline void pmd_free(pmd_t *pmd) | ||
93 | { | ||
94 | kmem_cache_free(pgtable_cache[PMD_CACHE_NUM], pmd); | ||
95 | } | ||
96 | |||
97 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | ||
98 | unsigned long address) | ||
99 | { | ||
100 | return kmem_cache_alloc(pgtable_cache[PTE_CACHE_NUM], | ||
101 | GFP_KERNEL|__GFP_REPEAT); | ||
102 | } | ||
103 | |||
104 | static inline struct page *pte_alloc_one(struct mm_struct *mm, | ||
105 | unsigned long address) | ||
106 | { | ||
107 | return virt_to_page(pte_alloc_one_kernel(mm, address)); | ||
108 | } | ||
109 | |||
110 | static inline void pte_free_kernel(pte_t *pte) | ||
111 | { | ||
112 | kmem_cache_free(pgtable_cache[PTE_CACHE_NUM], pte); | ||
113 | } | ||
114 | |||
115 | static inline void pte_free(struct page *ptepage) | ||
116 | { | ||
117 | pte_free_kernel(page_address(ptepage)); | ||
118 | } | ||
119 | |||
120 | #define PGF_CACHENUM_MASK 0x3 | ||
121 | |||
122 | typedef struct pgtable_free { | ||
123 | unsigned long val; | ||
124 | } pgtable_free_t; | ||
125 | |||
126 | static inline pgtable_free_t pgtable_free_cache(void *p, int cachenum, | ||
127 | unsigned long mask) | ||
128 | { | ||
129 | BUG_ON(cachenum > PGF_CACHENUM_MASK); | ||
130 | |||
131 | return (pgtable_free_t){.val = ((unsigned long) p & ~mask) | cachenum}; | ||
132 | } | ||
133 | |||
134 | static inline void pgtable_free(pgtable_free_t pgf) | ||
135 | { | ||
136 | void *p = (void *)(pgf.val & ~PGF_CACHENUM_MASK); | ||
137 | int cachenum = pgf.val & PGF_CACHENUM_MASK; | ||
138 | |||
139 | kmem_cache_free(pgtable_cache[cachenum], p); | ||
140 | } | ||
141 | |||
142 | extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); | ||
143 | |||
144 | #define __pte_free_tlb(tlb, ptepage) \ | ||
145 | pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ | ||
146 | PTE_CACHE_NUM, PTE_TABLE_SIZE-1)) | ||
147 | #define __pmd_free_tlb(tlb, pmd) \ | ||
148 | pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \ | ||
149 | PMD_CACHE_NUM, PMD_TABLE_SIZE-1)) | ||
150 | #ifndef CONFIG_PPC_64K_PAGES | ||
151 | #define __pud_free_tlb(tlb, pud) \ | ||
152 | pgtable_free_tlb(tlb, pgtable_free_cache(pud, \ | ||
153 | PUD_CACHE_NUM, PUD_TABLE_SIZE-1)) | ||
154 | #endif /* CONFIG_PPC_64K_PAGES */ | ||
155 | |||
156 | #define check_pgt_cache() do { } while (0) | ||
157 | |||
158 | #endif /* CONFIG_PPC64 */ | ||
159 | #endif /* __KERNEL__ */ | 11 | #endif /* __KERNEL__ */ |
160 | #endif /* _ASM_POWERPC_PGALLOC_H */ | 12 | #endif /* _ASM_POWERPC_PGALLOC_H */ |
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h index a28fa8bc01da..1744d6ac12a2 100644 --- a/include/asm-powerpc/pgtable-4k.h +++ b/include/asm-powerpc/pgtable-4k.h | |||
@@ -1,3 +1,5 @@ | |||
1 | #ifndef _ASM_POWERPC_PGTABLE_4K_H | ||
2 | #define _ASM_POWERPC_PGTABLE_4K_H | ||
1 | /* | 3 | /* |
2 | * Entries per page directory level. The PTE level must use a 64b record | 4 | * Entries per page directory level. The PTE level must use a 64b record |
3 | * for each page table entry. The PMD and PGD level use a 32b record for | 5 | * for each page table entry. The PMD and PGD level use a 32b record for |
@@ -100,3 +102,4 @@ | |||
100 | 102 | ||
101 | #define remap_4k_pfn(vma, addr, pfn, prot) \ | 103 | #define remap_4k_pfn(vma, addr, pfn, prot) \ |
102 | remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, (prot)) | 104 | remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, (prot)) |
105 | #endif /* _ASM_POWERPC_PGTABLE_4K_H */ | ||
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h index 5e84f070eaf7..16ef4978520d 100644 --- a/include/asm-powerpc/pgtable-64k.h +++ b/include/asm-powerpc/pgtable-64k.h | |||
@@ -1,6 +1,5 @@ | |||
1 | #ifndef _ASM_POWERPC_PGTABLE_64K_H | 1 | #ifndef _ASM_POWERPC_PGTABLE_64K_H |
2 | #define _ASM_POWERPC_PGTABLE_64K_H | 2 | #define _ASM_POWERPC_PGTABLE_64K_H |
3 | #ifdef __KERNEL__ | ||
4 | 3 | ||
5 | #include <asm-generic/pgtable-nopud.h> | 4 | #include <asm-generic/pgtable-nopud.h> |
6 | 5 | ||
@@ -65,8 +64,6 @@ | |||
65 | /* Bits to mask out from a PGD/PUD to get to the PMD page */ | 64 | /* Bits to mask out from a PGD/PUD to get to the PMD page */ |
66 | #define PUD_MASKED_BITS 0x1ff | 65 | #define PUD_MASKED_BITS 0x1ff |
67 | 66 | ||
68 | #ifndef __ASSEMBLY__ | ||
69 | |||
70 | /* Manipulate "rpte" values */ | 67 | /* Manipulate "rpte" values */ |
71 | #define __real_pte(e,p) ((real_pte_t) { \ | 68 | #define __real_pte(e,p) ((real_pte_t) { \ |
72 | (e), pte_val(*((p) + PTRS_PER_PTE)) }) | 69 | (e), pte_val(*((p) + PTRS_PER_PTE)) }) |
@@ -98,6 +95,4 @@ | |||
98 | remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \ | 95 | remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, \ |
99 | __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)) | 96 | __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)) |
100 | 97 | ||
101 | #endif /* __ASSEMBLY__ */ | ||
102 | #endif /* __KERNEL__ */ | ||
103 | #endif /* _ASM_POWERPC_PGTABLE_64K_H */ | 98 | #endif /* _ASM_POWERPC_PGTABLE_64K_H */ |
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h new file mode 100644 index 000000000000..09662a24f226 --- /dev/null +++ b/include/asm-powerpc/pgtable-ppc32.h | |||
@@ -0,0 +1,813 @@ | |||
1 | #ifndef _ASM_POWERPC_PGTABLE_PPC32_H | ||
2 | #define _ASM_POWERPC_PGTABLE_PPC32_H | ||
3 | |||
4 | #include <asm-generic/pgtable-nopmd.h> | ||
5 | |||
6 | #ifndef __ASSEMBLY__ | ||
7 | #include <linux/sched.h> | ||
8 | #include <linux/threads.h> | ||
9 | #include <asm/processor.h> /* For TASK_SIZE */ | ||
10 | #include <asm/mmu.h> | ||
11 | #include <asm/page.h> | ||
12 | #include <asm/io.h> /* For sub-arch specific PPC_PIN_SIZE */ | ||
13 | struct mm_struct; | ||
14 | |||
15 | extern unsigned long va_to_phys(unsigned long address); | ||
16 | extern pte_t *va_to_pte(unsigned long address); | ||
17 | extern unsigned long ioremap_bot, ioremap_base; | ||
18 | #endif /* __ASSEMBLY__ */ | ||
19 | |||
20 | /* | ||
21 | * The PowerPC MMU uses a hash table containing PTEs, together with | ||
22 | * a set of 16 segment registers (on 32-bit implementations), to define | ||
23 | * the virtual to physical address mapping. | ||
24 | * | ||
25 | * We use the hash table as an extended TLB, i.e. a cache of currently | ||
26 | * active mappings. We maintain a two-level page table tree, much | ||
27 | * like that used by the i386, for the sake of the Linux memory | ||
28 | * management code. Low-level assembler code in hashtable.S | ||
29 | * (procedure hash_page) is responsible for extracting ptes from the | ||
30 | * tree and putting them into the hash table when necessary, and | ||
31 | * updating the accessed and modified bits in the page table tree. | ||
32 | */ | ||
33 | |||
34 | /* | ||
35 | * The PowerPC MPC8xx uses a TLB with hardware assisted, software tablewalk. | ||
36 | * We also use the two level tables, but we can put the real bits in them | ||
37 | * needed for the TLB and tablewalk. These definitions require Mx_CTR.PPM = 0, | ||
38 | * Mx_CTR.PPCS = 0, and MD_CTR.TWAM = 1. The level 2 descriptor has | ||
39 | * additional page protection (when Mx_CTR.PPCS = 1) that allows TLB hit | ||
40 | * based upon user/super access. The TLB does not have accessed nor write | ||
41 | * protect. We assume that if the TLB get loaded with an entry it is | ||
42 | * accessed, and overload the changed bit for write protect. We use | ||
43 | * two bits in the software pte that are supposed to be set to zero in | ||
44 | * the TLB entry (24 and 25) for these indicators. Although the level 1 | ||
45 | * descriptor contains the guarded and writethrough/copyback bits, we can | ||
46 | * set these at the page level since they get copied from the Mx_TWC | ||
47 | * register when the TLB entry is loaded. We will use bit 27 for guard, since | ||
48 | * that is where it exists in the MD_TWC, and bit 26 for writethrough. | ||
49 | * These will get masked from the level 2 descriptor at TLB load time, and | ||
50 | * copied to the MD_TWC before it gets loaded. | ||
51 | * Large page sizes added. We currently support two sizes, 4K and 8M. | ||
52 | * This also allows a TLB hander optimization because we can directly | ||
53 | * load the PMD into MD_TWC. The 8M pages are only used for kernel | ||
54 | * mapping of well known areas. The PMD (PGD) entries contain control | ||
55 | * flags in addition to the address, so care must be taken that the | ||
56 | * software no longer assumes these are only pointers. | ||
57 | */ | ||
58 | |||
59 | /* | ||
60 | * At present, all PowerPC 400-class processors share a similar TLB | ||
61 | * architecture. The instruction and data sides share a unified, | ||
62 | * 64-entry, fully-associative TLB which is maintained totally under | ||
63 | * software control. In addition, the instruction side has a | ||
64 | * hardware-managed, 4-entry, fully-associative TLB which serves as a | ||
65 | * first level to the shared TLB. These two TLBs are known as the UTLB | ||
66 | * and ITLB, respectively (see "mmu.h" for definitions). | ||
67 | */ | ||
68 | |||
69 | /* | ||
70 | * The normal case is that PTEs are 32-bits and we have a 1-page | ||
71 | * 1024-entry pgdir pointing to 1-page 1024-entry PTE pages. -- paulus | ||
72 | * | ||
73 | * For any >32-bit physical address platform, we can use the following | ||
74 | * two level page table layout where the pgdir is 8KB and the MS 13 bits | ||
75 | * are an index to the second level table. The combined pgdir/pmd first | ||
76 | * level has 2048 entries and the second level has 512 64-bit PTE entries. | ||
77 | * -Matt | ||
78 | */ | ||
79 | /* PGDIR_SHIFT determines what a top-level page table entry can map */ | ||
80 | #define PGDIR_SHIFT (PAGE_SHIFT + PTE_SHIFT) | ||
81 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) | ||
82 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) | ||
83 | |||
84 | /* | ||
85 | * entries per page directory level: our page-table tree is two-level, so | ||
86 | * we don't really have any PMD directory. | ||
87 | */ | ||
88 | #define PTRS_PER_PTE (1 << PTE_SHIFT) | ||
89 | #define PTRS_PER_PMD 1 | ||
90 | #define PTRS_PER_PGD (1 << (32 - PGDIR_SHIFT)) | ||
91 | |||
92 | #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) | ||
93 | #define FIRST_USER_ADDRESS 0 | ||
94 | |||
95 | #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) | ||
96 | #define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS) | ||
97 | |||
98 | #define pte_ERROR(e) \ | ||
99 | printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \ | ||
100 | (unsigned long long)pte_val(e)) | ||
101 | #define pgd_ERROR(e) \ | ||
102 | printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) | ||
103 | |||
104 | /* | ||
105 | * Just any arbitrary offset to the start of the vmalloc VM area: the | ||
106 | * current 64MB value just means that there will be a 64MB "hole" after the | ||
107 | * physical memory until the kernel virtual memory starts. That means that | ||
108 | * any out-of-bounds memory accesses will hopefully be caught. | ||
109 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced | ||
110 | * area for the same reason. ;) | ||
111 | * | ||
112 | * We no longer map larger than phys RAM with the BATs so we don't have | ||
113 | * to worry about the VMALLOC_OFFSET causing problems. We do have to worry | ||
114 | * about clashes between our early calls to ioremap() that start growing down | ||
115 | * from ioremap_base being run into the VM area allocations (growing upwards | ||
116 | * from VMALLOC_START). For this reason we have ioremap_bot to check when | ||
117 | * we actually run into our mappings setup in the early boot with the VM | ||
118 | * system. This really does become a problem for machines with good amounts | ||
119 | * of RAM. -- Cort | ||
120 | */ | ||
121 | #define VMALLOC_OFFSET (0x1000000) /* 16M */ | ||
122 | #ifdef PPC_PIN_SIZE | ||
123 | #define VMALLOC_START (((_ALIGN((long)high_memory, PPC_PIN_SIZE) + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))) | ||
124 | #else | ||
125 | #define VMALLOC_START ((((long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))) | ||
126 | #endif | ||
127 | #define VMALLOC_END ioremap_bot | ||
128 | |||
129 | /* | ||
130 | * Bits in a linux-style PTE. These match the bits in the | ||
131 | * (hardware-defined) PowerPC PTE as closely as possible. | ||
132 | */ | ||
133 | |||
134 | #if defined(CONFIG_40x) | ||
135 | |||
136 | /* There are several potential gotchas here. The 40x hardware TLBLO | ||
137 | field looks like this: | ||
138 | |||
139 | 0 1 2 3 4 ... 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ||
140 | RPN..................... 0 0 EX WR ZSEL....... W I M G | ||
141 | |||
142 | Where possible we make the Linux PTE bits match up with this | ||
143 | |||
144 | - bits 20 and 21 must be cleared, because we use 4k pages (40x can | ||
145 | support down to 1k pages), this is done in the TLBMiss exception | ||
146 | handler. | ||
147 | - We use only zones 0 (for kernel pages) and 1 (for user pages) | ||
148 | of the 16 available. Bit 24-26 of the TLB are cleared in the TLB | ||
149 | miss handler. Bit 27 is PAGE_USER, thus selecting the correct | ||
150 | zone. | ||
151 | - PRESENT *must* be in the bottom two bits because swap cache | ||
152 | entries use the top 30 bits. Because 40x doesn't support SMP | ||
153 | anyway, M is irrelevant so we borrow it for PAGE_PRESENT. Bit 30 | ||
154 | is cleared in the TLB miss handler before the TLB entry is loaded. | ||
155 | - All other bits of the PTE are loaded into TLBLO without | ||
156 | modification, leaving us only the bits 20, 21, 24, 25, 26, 30 for | ||
157 | software PTE bits. We actually use use bits 21, 24, 25, and | ||
158 | 30 respectively for the software bits: ACCESSED, DIRTY, RW, and | ||
159 | PRESENT. | ||
160 | */ | ||
161 | |||
162 | /* Definitions for 40x embedded chips. */ | ||
163 | #define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ | ||
164 | #define _PAGE_FILE 0x001 /* when !present: nonlinear file mapping */ | ||
165 | #define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ | ||
166 | #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ | ||
167 | #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ | ||
168 | #define _PAGE_USER 0x010 /* matches one of the zone permission bits */ | ||
169 | #define _PAGE_RW 0x040 /* software: Writes permitted */ | ||
170 | #define _PAGE_DIRTY 0x080 /* software: dirty page */ | ||
171 | #define _PAGE_HWWRITE 0x100 /* hardware: Dirty & RW, set in exception */ | ||
172 | #define _PAGE_HWEXEC 0x200 /* hardware: EX permission */ | ||
173 | #define _PAGE_ACCESSED 0x400 /* software: R: page referenced */ | ||
174 | |||
175 | #define _PMD_PRESENT 0x400 /* PMD points to page of PTEs */ | ||
176 | #define _PMD_BAD 0x802 | ||
177 | #define _PMD_SIZE 0x0e0 /* size field, != 0 for large-page PMD entry */ | ||
178 | #define _PMD_SIZE_4M 0x0c0 | ||
179 | #define _PMD_SIZE_16M 0x0e0 | ||
180 | #define PMD_PAGE_SIZE(pmdval) (1024 << (((pmdval) & _PMD_SIZE) >> 4)) | ||
181 | |||
182 | #elif defined(CONFIG_44x) | ||
183 | /* | ||
184 | * Definitions for PPC440 | ||
185 | * | ||
186 | * Because of the 3 word TLB entries to support 36-bit addressing, | ||
187 | * the attribute are difficult to map in such a fashion that they | ||
188 | * are easily loaded during exception processing. I decided to | ||
189 | * organize the entry so the ERPN is the only portion in the | ||
190 | * upper word of the PTE and the attribute bits below are packed | ||
191 | * in as sensibly as they can be in the area below a 4KB page size | ||
192 | * oriented RPN. This at least makes it easy to load the RPN and | ||
193 | * ERPN fields in the TLB. -Matt | ||
194 | * | ||
195 | * Note that these bits preclude future use of a page size | ||
196 | * less than 4KB. | ||
197 | * | ||
198 | * | ||
199 | * PPC 440 core has following TLB attribute fields; | ||
200 | * | ||
201 | * TLB1: | ||
202 | * 0 1 2 3 4 ... 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ||
203 | * RPN................................. - - - - - - ERPN....... | ||
204 | * | ||
205 | * TLB2: | ||
206 | * 0 1 2 3 4 ... 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ||
207 | * - - - - - - U0 U1 U2 U3 W I M G E - UX UW UR SX SW SR | ||
208 | * | ||
209 | * There are some constrains and options, to decide mapping software bits | ||
210 | * into TLB entry. | ||
211 | * | ||
212 | * - PRESENT *must* be in the bottom three bits because swap cache | ||
213 | * entries use the top 29 bits for TLB2. | ||
214 | * | ||
215 | * - FILE *must* be in the bottom three bits because swap cache | ||
216 | * entries use the top 29 bits for TLB2. | ||
217 | * | ||
218 | * - CACHE COHERENT bit (M) has no effect on PPC440 core, because it | ||
219 | * doesn't support SMP. So we can use this as software bit, like | ||
220 | * DIRTY. | ||
221 | * | ||
222 | * With the PPC 44x Linux implementation, the 0-11th LSBs of the PTE are used | ||
223 | * for memory protection related functions (see PTE structure in | ||
224 | * include/asm-ppc/mmu.h). The _PAGE_XXX definitions in this file map to the | ||
225 | * above bits. Note that the bit values are CPU specific, not architecture | ||
226 | * specific. | ||
227 | * | ||
228 | * The kernel PTE entry holds an arch-dependent swp_entry structure under | ||
229 | * certain situations. In other words, in such situations some portion of | ||
230 | * the PTE bits are used as a swp_entry. In the PPC implementation, the | ||
231 | * 3-24th LSB are shared with swp_entry, however the 0-2nd three LSB still | ||
232 | * hold protection values. That means the three protection bits are | ||
233 | * reserved for both PTE and SWAP entry at the most significant three | ||
234 | * LSBs. | ||
235 | * | ||
236 | * There are three protection bits available for SWAP entry: | ||
237 | * _PAGE_PRESENT | ||
238 | * _PAGE_FILE | ||
239 | * _PAGE_HASHPTE (if HW has) | ||
240 | * | ||
241 | * So those three bits have to be inside of 0-2nd LSB of PTE. | ||
242 | * | ||
243 | */ | ||
244 | |||
245 | #define _PAGE_PRESENT 0x00000001 /* S: PTE valid */ | ||
246 | #define _PAGE_RW 0x00000002 /* S: Write permission */ | ||
247 | #define _PAGE_FILE 0x00000004 /* S: nonlinear file mapping */ | ||
248 | #define _PAGE_ACCESSED 0x00000008 /* S: Page referenced */ | ||
249 | #define _PAGE_HWWRITE 0x00000010 /* H: Dirty & RW */ | ||
250 | #define _PAGE_HWEXEC 0x00000020 /* H: Execute permission */ | ||
251 | #define _PAGE_USER 0x00000040 /* S: User page */ | ||
252 | #define _PAGE_ENDIAN 0x00000080 /* H: E bit */ | ||
253 | #define _PAGE_GUARDED 0x00000100 /* H: G bit */ | ||
254 | #define _PAGE_DIRTY 0x00000200 /* S: Page dirty */ | ||
255 | #define _PAGE_NO_CACHE 0x00000400 /* H: I bit */ | ||
256 | #define _PAGE_WRITETHRU 0x00000800 /* H: W bit */ | ||
257 | |||
258 | /* TODO: Add large page lowmem mapping support */ | ||
259 | #define _PMD_PRESENT 0 | ||
260 | #define _PMD_PRESENT_MASK (PAGE_MASK) | ||
261 | #define _PMD_BAD (~PAGE_MASK) | ||
262 | |||
263 | /* ERPN in a PTE never gets cleared, ignore it */ | ||
264 | #define _PTE_NONE_MASK 0xffffffff00000000ULL | ||
265 | |||
266 | #elif defined(CONFIG_FSL_BOOKE) | ||
267 | /* | ||
268 | MMU Assist Register 3: | ||
269 | |||
270 | 32 33 34 35 36 ... 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | ||
271 | RPN...................... 0 0 U0 U1 U2 U3 UX SX UW SW UR SR | ||
272 | |||
273 | - PRESENT *must* be in the bottom three bits because swap cache | ||
274 | entries use the top 29 bits. | ||
275 | |||
276 | - FILE *must* be in the bottom three bits because swap cache | ||
277 | entries use the top 29 bits. | ||
278 | */ | ||
279 | |||
280 | /* Definitions for FSL Book-E Cores */ | ||
281 | #define _PAGE_PRESENT 0x00001 /* S: PTE contains a translation */ | ||
282 | #define _PAGE_USER 0x00002 /* S: User page (maps to UR) */ | ||
283 | #define _PAGE_FILE 0x00002 /* S: when !present: nonlinear file mapping */ | ||
284 | #define _PAGE_ACCESSED 0x00004 /* S: Page referenced */ | ||
285 | #define _PAGE_HWWRITE 0x00008 /* H: Dirty & RW, set in exception */ | ||
286 | #define _PAGE_RW 0x00010 /* S: Write permission */ | ||
287 | #define _PAGE_HWEXEC 0x00020 /* H: UX permission */ | ||
288 | |||
289 | #define _PAGE_ENDIAN 0x00040 /* H: E bit */ | ||
290 | #define _PAGE_GUARDED 0x00080 /* H: G bit */ | ||
291 | #define _PAGE_COHERENT 0x00100 /* H: M bit */ | ||
292 | #define _PAGE_NO_CACHE 0x00200 /* H: I bit */ | ||
293 | #define _PAGE_WRITETHRU 0x00400 /* H: W bit */ | ||
294 | |||
295 | #ifdef CONFIG_PTE_64BIT | ||
296 | #define _PAGE_DIRTY 0x08000 /* S: Page dirty */ | ||
297 | |||
298 | /* ERPN in a PTE never gets cleared, ignore it */ | ||
299 | #define _PTE_NONE_MASK 0xffffffffffff0000ULL | ||
300 | #else | ||
301 | #define _PAGE_DIRTY 0x00800 /* S: Page dirty */ | ||
302 | #endif | ||
303 | |||
304 | #define _PMD_PRESENT 0 | ||
305 | #define _PMD_PRESENT_MASK (PAGE_MASK) | ||
306 | #define _PMD_BAD (~PAGE_MASK) | ||
307 | |||
308 | #elif defined(CONFIG_8xx) | ||
309 | /* Definitions for 8xx embedded chips. */ | ||
310 | #define _PAGE_PRESENT 0x0001 /* Page is valid */ | ||
311 | #define _PAGE_FILE 0x0002 /* when !present: nonlinear file mapping */ | ||
312 | #define _PAGE_NO_CACHE 0x0002 /* I: cache inhibit */ | ||
313 | #define _PAGE_SHARED 0x0004 /* No ASID (context) compare */ | ||
314 | |||
315 | /* These five software bits must be masked out when the entry is loaded | ||
316 | * into the TLB. | ||
317 | */ | ||
318 | #define _PAGE_EXEC 0x0008 /* software: i-cache coherency required */ | ||
319 | #define _PAGE_GUARDED 0x0010 /* software: guarded access */ | ||
320 | #define _PAGE_DIRTY 0x0020 /* software: page changed */ | ||
321 | #define _PAGE_RW 0x0040 /* software: user write access allowed */ | ||
322 | #define _PAGE_ACCESSED 0x0080 /* software: page referenced */ | ||
323 | |||
324 | /* Setting any bits in the nibble with the follow two controls will | ||
325 | * require a TLB exception handler change. It is assumed unused bits | ||
326 | * are always zero. | ||
327 | */ | ||
328 | #define _PAGE_HWWRITE 0x0100 /* h/w write enable: never set in Linux PTE */ | ||
329 | #define _PAGE_USER 0x0800 /* One of the PP bits, the other is USER&~RW */ | ||
330 | |||
331 | #define _PMD_PRESENT 0x0001 | ||
332 | #define _PMD_BAD 0x0ff0 | ||
333 | #define _PMD_PAGE_MASK 0x000c | ||
334 | #define _PMD_PAGE_8M 0x000c | ||
335 | |||
336 | /* | ||
337 | * The 8xx TLB miss handler allegedly sets _PAGE_ACCESSED in the PTE | ||
338 | * for an address even if _PAGE_PRESENT is not set, as a performance | ||
339 | * optimization. This is a bug if you ever want to use swap unless | ||
340 | * _PAGE_ACCESSED is 2, which it isn't, or unless you have 8xx-specific | ||
341 | * definitions for __swp_entry etc. below, which would be gross. | ||
342 | * -- paulus | ||
343 | */ | ||
344 | #define _PTE_NONE_MASK _PAGE_ACCESSED | ||
345 | |||
346 | #else /* CONFIG_6xx */ | ||
347 | /* Definitions for 60x, 740/750, etc. */ | ||
348 | #define _PAGE_PRESENT 0x001 /* software: pte contains a translation */ | ||
349 | #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */ | ||
350 | #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ | ||
351 | #define _PAGE_USER 0x004 /* usermode access allowed */ | ||
352 | #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ | ||
353 | #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ | ||
354 | #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ | ||
355 | #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ | ||
356 | #define _PAGE_DIRTY 0x080 /* C: page changed */ | ||
357 | #define _PAGE_ACCESSED 0x100 /* R: page referenced */ | ||
358 | #define _PAGE_EXEC 0x200 /* software: i-cache coherency required */ | ||
359 | #define _PAGE_RW 0x400 /* software: user write access allowed */ | ||
360 | |||
361 | #define _PTE_NONE_MASK _PAGE_HASHPTE | ||
362 | |||
363 | #define _PMD_PRESENT 0 | ||
364 | #define _PMD_PRESENT_MASK (PAGE_MASK) | ||
365 | #define _PMD_BAD (~PAGE_MASK) | ||
366 | #endif | ||
367 | |||
368 | /* | ||
369 | * Some bits are only used on some cpu families... | ||
370 | */ | ||
371 | #ifndef _PAGE_HASHPTE | ||
372 | #define _PAGE_HASHPTE 0 | ||
373 | #endif | ||
374 | #ifndef _PTE_NONE_MASK | ||
375 | #define _PTE_NONE_MASK 0 | ||
376 | #endif | ||
377 | #ifndef _PAGE_SHARED | ||
378 | #define _PAGE_SHARED 0 | ||
379 | #endif | ||
380 | #ifndef _PAGE_HWWRITE | ||
381 | #define _PAGE_HWWRITE 0 | ||
382 | #endif | ||
383 | #ifndef _PAGE_HWEXEC | ||
384 | #define _PAGE_HWEXEC 0 | ||
385 | #endif | ||
386 | #ifndef _PAGE_EXEC | ||
387 | #define _PAGE_EXEC 0 | ||
388 | #endif | ||
389 | #ifndef _PMD_PRESENT_MASK | ||
390 | #define _PMD_PRESENT_MASK _PMD_PRESENT | ||
391 | #endif | ||
392 | #ifndef _PMD_SIZE | ||
393 | #define _PMD_SIZE 0 | ||
394 | #define PMD_PAGE_SIZE(pmd) bad_call_to_PMD_PAGE_SIZE() | ||
395 | #endif | ||
396 | |||
397 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY) | ||
398 | |||
399 | /* | ||
400 | * Note: the _PAGE_COHERENT bit automatically gets set in the hardware | ||
401 | * PTE if CONFIG_SMP is defined (hash_page does this); there is no need | ||
402 | * to have it in the Linux PTE, and in fact the bit could be reused for | ||
403 | * another purpose. -- paulus. | ||
404 | */ | ||
405 | |||
406 | #ifdef CONFIG_44x | ||
407 | #define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_GUARDED) | ||
408 | #else | ||
409 | #define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED) | ||
410 | #endif | ||
411 | #define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY | _PAGE_HWWRITE) | ||
412 | #define _PAGE_KERNEL (_PAGE_BASE | _PAGE_SHARED | _PAGE_WRENABLE) | ||
413 | |||
414 | #ifdef CONFIG_PPC_STD_MMU | ||
415 | /* On standard PPC MMU, no user access implies kernel read/write access, | ||
416 | * so to write-protect kernel memory we must turn on user access */ | ||
417 | #define _PAGE_KERNEL_RO (_PAGE_BASE | _PAGE_SHARED | _PAGE_USER) | ||
418 | #else | ||
419 | #define _PAGE_KERNEL_RO (_PAGE_BASE | _PAGE_SHARED) | ||
420 | #endif | ||
421 | |||
422 | #define _PAGE_IO (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED) | ||
423 | #define _PAGE_RAM (_PAGE_KERNEL | _PAGE_HWEXEC) | ||
424 | |||
425 | #if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) | ||
426 | /* We want the debuggers to be able to set breakpoints anywhere, so | ||
427 | * don't write protect the kernel text */ | ||
428 | #define _PAGE_RAM_TEXT _PAGE_RAM | ||
429 | #else | ||
430 | #define _PAGE_RAM_TEXT (_PAGE_KERNEL_RO | _PAGE_HWEXEC) | ||
431 | #endif | ||
432 | |||
433 | #define PAGE_NONE __pgprot(_PAGE_BASE) | ||
434 | #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
435 | #define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
436 | #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW) | ||
437 | #define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC) | ||
438 | #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
439 | #define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
440 | |||
441 | #define PAGE_KERNEL __pgprot(_PAGE_RAM) | ||
442 | #define PAGE_KERNEL_NOCACHE __pgprot(_PAGE_IO) | ||
443 | |||
444 | /* | ||
445 | * The PowerPC can only do execute protection on a segment (256MB) basis, | ||
446 | * not on a page basis. So we consider execute permission the same as read. | ||
447 | * Also, write permissions imply read permissions. | ||
448 | * This is the closest we can get.. | ||
449 | */ | ||
450 | #define __P000 PAGE_NONE | ||
451 | #define __P001 PAGE_READONLY_X | ||
452 | #define __P010 PAGE_COPY | ||
453 | #define __P011 PAGE_COPY_X | ||
454 | #define __P100 PAGE_READONLY | ||
455 | #define __P101 PAGE_READONLY_X | ||
456 | #define __P110 PAGE_COPY | ||
457 | #define __P111 PAGE_COPY_X | ||
458 | |||
459 | #define __S000 PAGE_NONE | ||
460 | #define __S001 PAGE_READONLY_X | ||
461 | #define __S010 PAGE_SHARED | ||
462 | #define __S011 PAGE_SHARED_X | ||
463 | #define __S100 PAGE_READONLY | ||
464 | #define __S101 PAGE_READONLY_X | ||
465 | #define __S110 PAGE_SHARED | ||
466 | #define __S111 PAGE_SHARED_X | ||
467 | |||
468 | #ifndef __ASSEMBLY__ | ||
469 | /* Make sure we get a link error if PMD_PAGE_SIZE is ever called on a | ||
470 | * kernel without large page PMD support */ | ||
471 | extern unsigned long bad_call_to_PMD_PAGE_SIZE(void); | ||
472 | |||
473 | /* | ||
474 | * Conversions between PTE values and page frame numbers. | ||
475 | */ | ||
476 | |||
477 | /* in some case we want to additionaly adjust where the pfn is in the pte to | ||
478 | * allow room for more flags */ | ||
479 | #if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_PTE_64BIT) | ||
480 | #define PFN_SHIFT_OFFSET (PAGE_SHIFT + 8) | ||
481 | #else | ||
482 | #define PFN_SHIFT_OFFSET (PAGE_SHIFT) | ||
483 | #endif | ||
484 | |||
485 | #define pte_pfn(x) (pte_val(x) >> PFN_SHIFT_OFFSET) | ||
486 | #define pte_page(x) pfn_to_page(pte_pfn(x)) | ||
487 | |||
488 | #define pfn_pte(pfn, prot) __pte(((pte_basic_t)(pfn) << PFN_SHIFT_OFFSET) |\ | ||
489 | pgprot_val(prot)) | ||
490 | #define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot) | ||
491 | |||
492 | /* | ||
493 | * ZERO_PAGE is a global shared page that is always zero: used | ||
494 | * for zero-mapped memory areas etc.. | ||
495 | */ | ||
496 | extern unsigned long empty_zero_page[1024]; | ||
497 | #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) | ||
498 | |||
499 | #endif /* __ASSEMBLY__ */ | ||
500 | |||
501 | #define pte_none(pte) ((pte_val(pte) & ~_PTE_NONE_MASK) == 0) | ||
502 | #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) | ||
503 | #define pte_clear(mm,addr,ptep) do { set_pte_at((mm), (addr), (ptep), __pte(0)); } while (0) | ||
504 | |||
505 | #define pmd_none(pmd) (!pmd_val(pmd)) | ||
506 | #define pmd_bad(pmd) (pmd_val(pmd) & _PMD_BAD) | ||
507 | #define pmd_present(pmd) (pmd_val(pmd) & _PMD_PRESENT_MASK) | ||
508 | #define pmd_clear(pmdp) do { pmd_val(*(pmdp)) = 0; } while (0) | ||
509 | |||
510 | #ifndef __ASSEMBLY__ | ||
511 | /* | ||
512 | * The following only work if pte_present() is true. | ||
513 | * Undefined behaviour if not.. | ||
514 | */ | ||
515 | static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; } | ||
516 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; } | ||
517 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; } | ||
518 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } | ||
519 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | ||
520 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } | ||
521 | |||
522 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } | ||
523 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } | ||
524 | |||
525 | static inline pte_t pte_rdprotect(pte_t pte) { | ||
526 | pte_val(pte) &= ~_PAGE_USER; return pte; } | ||
527 | static inline pte_t pte_wrprotect(pte_t pte) { | ||
528 | pte_val(pte) &= ~(_PAGE_RW | _PAGE_HWWRITE); return pte; } | ||
529 | static inline pte_t pte_exprotect(pte_t pte) { | ||
530 | pte_val(pte) &= ~_PAGE_EXEC; return pte; } | ||
531 | static inline pte_t pte_mkclean(pte_t pte) { | ||
532 | pte_val(pte) &= ~(_PAGE_DIRTY | _PAGE_HWWRITE); return pte; } | ||
533 | static inline pte_t pte_mkold(pte_t pte) { | ||
534 | pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } | ||
535 | |||
536 | static inline pte_t pte_mkread(pte_t pte) { | ||
537 | pte_val(pte) |= _PAGE_USER; return pte; } | ||
538 | static inline pte_t pte_mkexec(pte_t pte) { | ||
539 | pte_val(pte) |= _PAGE_USER | _PAGE_EXEC; return pte; } | ||
540 | static inline pte_t pte_mkwrite(pte_t pte) { | ||
541 | pte_val(pte) |= _PAGE_RW; return pte; } | ||
542 | static inline pte_t pte_mkdirty(pte_t pte) { | ||
543 | pte_val(pte) |= _PAGE_DIRTY; return pte; } | ||
544 | static inline pte_t pte_mkyoung(pte_t pte) { | ||
545 | pte_val(pte) |= _PAGE_ACCESSED; return pte; } | ||
546 | |||
547 | static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | ||
548 | { | ||
549 | pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); | ||
550 | return pte; | ||
551 | } | ||
552 | |||
553 | /* | ||
554 | * When flushing the tlb entry for a page, we also need to flush the hash | ||
555 | * table entry. flush_hash_pages is assembler (for speed) in hashtable.S. | ||
556 | */ | ||
557 | extern int flush_hash_pages(unsigned context, unsigned long va, | ||
558 | unsigned long pmdval, int count); | ||
559 | |||
560 | /* Add an HPTE to the hash table */ | ||
561 | extern void add_hash_page(unsigned context, unsigned long va, | ||
562 | unsigned long pmdval); | ||
563 | |||
564 | /* | ||
565 | * Atomic PTE updates. | ||
566 | * | ||
567 | * pte_update clears and sets bit atomically, and returns | ||
568 | * the old pte value. In the 64-bit PTE case we lock around the | ||
569 | * low PTE word since we expect ALL flag bits to be there | ||
570 | */ | ||
571 | #ifndef CONFIG_PTE_64BIT | ||
572 | static inline unsigned long pte_update(pte_t *p, unsigned long clr, | ||
573 | unsigned long set) | ||
574 | { | ||
575 | unsigned long old, tmp; | ||
576 | |||
577 | __asm__ __volatile__("\ | ||
578 | 1: lwarx %0,0,%3\n\ | ||
579 | andc %1,%0,%4\n\ | ||
580 | or %1,%1,%5\n" | ||
581 | PPC405_ERR77(0,%3) | ||
582 | " stwcx. %1,0,%3\n\ | ||
583 | bne- 1b" | ||
584 | : "=&r" (old), "=&r" (tmp), "=m" (*p) | ||
585 | : "r" (p), "r" (clr), "r" (set), "m" (*p) | ||
586 | : "cc" ); | ||
587 | return old; | ||
588 | } | ||
589 | #else | ||
590 | static inline unsigned long long pte_update(pte_t *p, unsigned long clr, | ||
591 | unsigned long set) | ||
592 | { | ||
593 | unsigned long long old; | ||
594 | unsigned long tmp; | ||
595 | |||
596 | __asm__ __volatile__("\ | ||
597 | 1: lwarx %L0,0,%4\n\ | ||
598 | lwzx %0,0,%3\n\ | ||
599 | andc %1,%L0,%5\n\ | ||
600 | or %1,%1,%6\n" | ||
601 | PPC405_ERR77(0,%3) | ||
602 | " stwcx. %1,0,%4\n\ | ||
603 | bne- 1b" | ||
604 | : "=&r" (old), "=&r" (tmp), "=m" (*p) | ||
605 | : "r" (p), "r" ((unsigned long)(p) + 4), "r" (clr), "r" (set), "m" (*p) | ||
606 | : "cc" ); | ||
607 | return old; | ||
608 | } | ||
609 | #endif | ||
610 | |||
611 | /* | ||
612 | * set_pte stores a linux PTE into the linux page table. | ||
613 | * On machines which use an MMU hash table we avoid changing the | ||
614 | * _PAGE_HASHPTE bit. | ||
615 | */ | ||
616 | static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, | ||
617 | pte_t *ptep, pte_t pte) | ||
618 | { | ||
619 | #if _PAGE_HASHPTE != 0 | ||
620 | pte_update(ptep, ~_PAGE_HASHPTE, pte_val(pte) & ~_PAGE_HASHPTE); | ||
621 | #else | ||
622 | *ptep = pte; | ||
623 | #endif | ||
624 | } | ||
625 | |||
626 | /* | ||
627 | * 2.6 calles this without flushing the TLB entry, this is wrong | ||
628 | * for our hash-based implementation, we fix that up here | ||
629 | */ | ||
630 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG | ||
631 | static inline int __ptep_test_and_clear_young(unsigned int context, unsigned long addr, pte_t *ptep) | ||
632 | { | ||
633 | unsigned long old; | ||
634 | old = pte_update(ptep, _PAGE_ACCESSED, 0); | ||
635 | #if _PAGE_HASHPTE != 0 | ||
636 | if (old & _PAGE_HASHPTE) { | ||
637 | unsigned long ptephys = __pa(ptep) & PAGE_MASK; | ||
638 | flush_hash_pages(context, addr, ptephys, 1); | ||
639 | } | ||
640 | #endif | ||
641 | return (old & _PAGE_ACCESSED) != 0; | ||
642 | } | ||
643 | #define ptep_test_and_clear_young(__vma, __addr, __ptep) \ | ||
644 | __ptep_test_and_clear_young((__vma)->vm_mm->context.id, __addr, __ptep) | ||
645 | |||
646 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY | ||
647 | static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, | ||
648 | unsigned long addr, pte_t *ptep) | ||
649 | { | ||
650 | return (pte_update(ptep, (_PAGE_DIRTY | _PAGE_HWWRITE), 0) & _PAGE_DIRTY) != 0; | ||
651 | } | ||
652 | |||
653 | #define __HAVE_ARCH_PTEP_GET_AND_CLEAR | ||
654 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, | ||
655 | pte_t *ptep) | ||
656 | { | ||
657 | return __pte(pte_update(ptep, ~_PAGE_HASHPTE, 0)); | ||
658 | } | ||
659 | |||
660 | #define __HAVE_ARCH_PTEP_SET_WRPROTECT | ||
661 | static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, | ||
662 | pte_t *ptep) | ||
663 | { | ||
664 | pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), 0); | ||
665 | } | ||
666 | |||
667 | #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS | ||
668 | static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty) | ||
669 | { | ||
670 | unsigned long bits = pte_val(entry) & | ||
671 | (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW); | ||
672 | pte_update(ptep, 0, bits); | ||
673 | } | ||
674 | |||
675 | #define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \ | ||
676 | do { \ | ||
677 | __ptep_set_access_flags(__ptep, __entry, __dirty); \ | ||
678 | flush_tlb_page_nohash(__vma, __address); \ | ||
679 | } while(0) | ||
680 | |||
681 | /* | ||
682 | * Macro to mark a page protection value as "uncacheable". | ||
683 | */ | ||
684 | #define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED)) | ||
685 | |||
686 | struct file; | ||
687 | extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | ||
688 | unsigned long size, pgprot_t vma_prot); | ||
689 | #define __HAVE_PHYS_MEM_ACCESS_PROT | ||
690 | |||
691 | #define __HAVE_ARCH_PTE_SAME | ||
692 | #define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0) | ||
693 | |||
694 | /* | ||
695 | * Note that on Book E processors, the pmd contains the kernel virtual | ||
696 | * (lowmem) address of the pte page. The physical address is less useful | ||
697 | * because everything runs with translation enabled (even the TLB miss | ||
698 | * handler). On everything else the pmd contains the physical address | ||
699 | * of the pte page. -- paulus | ||
700 | */ | ||
701 | #ifndef CONFIG_BOOKE | ||
702 | #define pmd_page_vaddr(pmd) \ | ||
703 | ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) | ||
704 | #define pmd_page(pmd) \ | ||
705 | (mem_map + (pmd_val(pmd) >> PAGE_SHIFT)) | ||
706 | #else | ||
707 | #define pmd_page_vaddr(pmd) \ | ||
708 | ((unsigned long) (pmd_val(pmd) & PAGE_MASK)) | ||
709 | #define pmd_page(pmd) \ | ||
710 | (mem_map + (__pa(pmd_val(pmd)) >> PAGE_SHIFT)) | ||
711 | #endif | ||
712 | |||
713 | /* to find an entry in a kernel page-table-directory */ | ||
714 | #define pgd_offset_k(address) pgd_offset(&init_mm, address) | ||
715 | |||
716 | /* to find an entry in a page-table-directory */ | ||
717 | #define pgd_index(address) ((address) >> PGDIR_SHIFT) | ||
718 | #define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) | ||
719 | |||
720 | /* Find an entry in the third-level page table.. */ | ||
721 | #define pte_index(address) \ | ||
722 | (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | ||
723 | #define pte_offset_kernel(dir, addr) \ | ||
724 | ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr)) | ||
725 | #define pte_offset_map(dir, addr) \ | ||
726 | ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr)) | ||
727 | #define pte_offset_map_nested(dir, addr) \ | ||
728 | ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_index(addr)) | ||
729 | |||
730 | #define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0) | ||
731 | #define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1) | ||
732 | |||
733 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | ||
734 | |||
735 | extern void paging_init(void); | ||
736 | |||
737 | /* | ||
738 | * Encode and decode a swap entry. | ||
739 | * Note that the bits we use in a PTE for representing a swap entry | ||
740 | * must not include the _PAGE_PRESENT bit, the _PAGE_FILE bit, or the | ||
741 | *_PAGE_HASHPTE bit (if used). -- paulus | ||
742 | */ | ||
743 | #define __swp_type(entry) ((entry).val & 0x1f) | ||
744 | #define __swp_offset(entry) ((entry).val >> 5) | ||
745 | #define __swp_entry(type, offset) ((swp_entry_t) { (type) | ((offset) << 5) }) | ||
746 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >> 3 }) | ||
747 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val << 3 }) | ||
748 | |||
749 | /* Encode and decode a nonlinear file mapping entry */ | ||
750 | #define PTE_FILE_MAX_BITS 29 | ||
751 | #define pte_to_pgoff(pte) (pte_val(pte) >> 3) | ||
752 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE }) | ||
753 | |||
754 | /* CONFIG_APUS */ | ||
755 | /* For virtual address to physical address conversion */ | ||
756 | extern void cache_clear(__u32 addr, int length); | ||
757 | extern void cache_push(__u32 addr, int length); | ||
758 | extern int mm_end_of_chunk (unsigned long addr, int len); | ||
759 | extern unsigned long iopa(unsigned long addr); | ||
760 | extern unsigned long mm_ptov(unsigned long addr) __attribute_const__; | ||
761 | |||
762 | /* Values for nocacheflag and cmode */ | ||
763 | /* These are not used by the APUS kernel_map, but prevents | ||
764 | compilation errors. */ | ||
765 | #define KERNELMAP_FULL_CACHING 0 | ||
766 | #define KERNELMAP_NOCACHE_SER 1 | ||
767 | #define KERNELMAP_NOCACHE_NONSER 2 | ||
768 | #define KERNELMAP_NO_COPYBACK 3 | ||
769 | |||
770 | /* | ||
771 | * Map some physical address range into the kernel address space. | ||
772 | */ | ||
773 | extern unsigned long kernel_map(unsigned long paddr, unsigned long size, | ||
774 | int nocacheflag, unsigned long *memavailp ); | ||
775 | |||
776 | /* | ||
777 | * Set cache mode of (kernel space) address range. | ||
778 | */ | ||
779 | extern void kernel_set_cachemode (unsigned long address, unsigned long size, | ||
780 | unsigned int cmode); | ||
781 | |||
782 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ | ||
783 | #define kern_addr_valid(addr) (1) | ||
784 | |||
785 | #ifdef CONFIG_PHYS_64BIT | ||
786 | extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, | ||
787 | unsigned long paddr, unsigned long size, pgprot_t prot); | ||
788 | |||
789 | static inline int io_remap_pfn_range(struct vm_area_struct *vma, | ||
790 | unsigned long vaddr, | ||
791 | unsigned long pfn, | ||
792 | unsigned long size, | ||
793 | pgprot_t prot) | ||
794 | { | ||
795 | phys_addr_t paddr64 = fixup_bigphys_addr(pfn << PAGE_SHIFT, size); | ||
796 | return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot); | ||
797 | } | ||
798 | #else | ||
799 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
800 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
801 | #endif | ||
802 | |||
803 | /* | ||
804 | * No page table caches to initialise | ||
805 | */ | ||
806 | #define pgtable_cache_init() do { } while (0) | ||
807 | |||
808 | extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, | ||
809 | pmd_t **pmdp); | ||
810 | |||
811 | #endif /* !__ASSEMBLY__ */ | ||
812 | |||
813 | #endif /* _ASM_POWERPC_PGTABLE_PPC32_H */ | ||
diff --git a/include/asm-powerpc/pgtable-ppc64.h b/include/asm-powerpc/pgtable-ppc64.h new file mode 100644 index 000000000000..704c4e669fe0 --- /dev/null +++ b/include/asm-powerpc/pgtable-ppc64.h | |||
@@ -0,0 +1,492 @@ | |||
1 | #ifndef _ASM_POWERPC_PGTABLE_PPC64_H_ | ||
2 | #define _ASM_POWERPC_PGTABLE_PPC64_H_ | ||
3 | /* | ||
4 | * This file contains the functions and defines necessary to modify and use | ||
5 | * the ppc64 hashed page table. | ||
6 | */ | ||
7 | |||
8 | #ifndef __ASSEMBLY__ | ||
9 | #include <linux/stddef.h> | ||
10 | #include <asm/processor.h> /* For TASK_SIZE */ | ||
11 | #include <asm/mmu.h> | ||
12 | #include <asm/page.h> | ||
13 | #include <asm/tlbflush.h> | ||
14 | struct mm_struct; | ||
15 | #endif /* __ASSEMBLY__ */ | ||
16 | |||
17 | #ifdef CONFIG_PPC_64K_PAGES | ||
18 | #include <asm/pgtable-64k.h> | ||
19 | #else | ||
20 | #include <asm/pgtable-4k.h> | ||
21 | #endif | ||
22 | |||
23 | #define FIRST_USER_ADDRESS 0 | ||
24 | |||
25 | /* | ||
26 | * Size of EA range mapped by our pagetables. | ||
27 | */ | ||
28 | #define PGTABLE_EADDR_SIZE (PTE_INDEX_SIZE + PMD_INDEX_SIZE + \ | ||
29 | PUD_INDEX_SIZE + PGD_INDEX_SIZE + PAGE_SHIFT) | ||
30 | #define PGTABLE_RANGE (1UL << PGTABLE_EADDR_SIZE) | ||
31 | |||
32 | #if TASK_SIZE_USER64 > PGTABLE_RANGE | ||
33 | #error TASK_SIZE_USER64 exceeds pagetable range | ||
34 | #endif | ||
35 | |||
36 | #if TASK_SIZE_USER64 > (1UL << (USER_ESID_BITS + SID_SHIFT)) | ||
37 | #error TASK_SIZE_USER64 exceeds user VSID range | ||
38 | #endif | ||
39 | |||
40 | /* | ||
41 | * Define the address range of the vmalloc VM area. | ||
42 | */ | ||
43 | #define VMALLOC_START ASM_CONST(0xD000000000000000) | ||
44 | #define VMALLOC_SIZE ASM_CONST(0x80000000000) | ||
45 | #define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE) | ||
46 | |||
47 | /* | ||
48 | * Define the address range of the imalloc VM area. | ||
49 | */ | ||
50 | #define PHBS_IO_BASE VMALLOC_END | ||
51 | #define IMALLOC_BASE (PHBS_IO_BASE + 0x80000000ul) /* Reserve 2 gigs for PHBs */ | ||
52 | #define IMALLOC_END (VMALLOC_START + PGTABLE_RANGE) | ||
53 | |||
54 | /* | ||
55 | * Region IDs | ||
56 | */ | ||
57 | #define REGION_SHIFT 60UL | ||
58 | #define REGION_MASK (0xfUL << REGION_SHIFT) | ||
59 | #define REGION_ID(ea) (((unsigned long)(ea)) >> REGION_SHIFT) | ||
60 | |||
61 | #define VMALLOC_REGION_ID (REGION_ID(VMALLOC_START)) | ||
62 | #define KERNEL_REGION_ID (REGION_ID(PAGE_OFFSET)) | ||
63 | #define USER_REGION_ID (0UL) | ||
64 | |||
65 | /* | ||
66 | * Common bits in a linux-style PTE. These match the bits in the | ||
67 | * (hardware-defined) PowerPC PTE as closely as possible. Additional | ||
68 | * bits may be defined in pgtable-*.h | ||
69 | */ | ||
70 | #define _PAGE_PRESENT 0x0001 /* software: pte contains a translation */ | ||
71 | #define _PAGE_USER 0x0002 /* matches one of the PP bits */ | ||
72 | #define _PAGE_FILE 0x0002 /* (!present only) software: pte holds file offset */ | ||
73 | #define _PAGE_EXEC 0x0004 /* No execute on POWER4 and newer (we invert) */ | ||
74 | #define _PAGE_GUARDED 0x0008 | ||
75 | #define _PAGE_COHERENT 0x0010 /* M: enforce memory coherence (SMP systems) */ | ||
76 | #define _PAGE_NO_CACHE 0x0020 /* I: cache inhibit */ | ||
77 | #define _PAGE_WRITETHRU 0x0040 /* W: cache write-through */ | ||
78 | #define _PAGE_DIRTY 0x0080 /* C: page changed */ | ||
79 | #define _PAGE_ACCESSED 0x0100 /* R: page referenced */ | ||
80 | #define _PAGE_RW 0x0200 /* software: user write access allowed */ | ||
81 | #define _PAGE_HASHPTE 0x0400 /* software: pte has an associated HPTE */ | ||
82 | #define _PAGE_BUSY 0x0800 /* software: PTE & hash are busy */ | ||
83 | |||
84 | #define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_COHERENT) | ||
85 | |||
86 | #define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY) | ||
87 | |||
88 | /* __pgprot defined in asm-powerpc/page.h */ | ||
89 | #define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED) | ||
90 | |||
91 | #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER) | ||
92 | #define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER | _PAGE_EXEC) | ||
93 | #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
94 | #define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
95 | #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
96 | #define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
97 | #define PAGE_KERNEL __pgprot(_PAGE_BASE | _PAGE_WRENABLE) | ||
98 | #define PAGE_KERNEL_CI __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \ | ||
99 | _PAGE_WRENABLE | _PAGE_NO_CACHE | _PAGE_GUARDED) | ||
100 | #define PAGE_KERNEL_EXEC __pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_EXEC) | ||
101 | |||
102 | #define PAGE_AGP __pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_NO_CACHE) | ||
103 | #define HAVE_PAGE_AGP | ||
104 | |||
105 | /* PTEIDX nibble */ | ||
106 | #define _PTEIDX_SECONDARY 0x8 | ||
107 | #define _PTEIDX_GROUP_IX 0x7 | ||
108 | |||
109 | |||
110 | /* | ||
111 | * POWER4 and newer have per page execute protection, older chips can only | ||
112 | * do this on a segment (256MB) basis. | ||
113 | * | ||
114 | * Also, write permissions imply read permissions. | ||
115 | * This is the closest we can get.. | ||
116 | * | ||
117 | * Note due to the way vm flags are laid out, the bits are XWR | ||
118 | */ | ||
119 | #define __P000 PAGE_NONE | ||
120 | #define __P001 PAGE_READONLY | ||
121 | #define __P010 PAGE_COPY | ||
122 | #define __P011 PAGE_COPY | ||
123 | #define __P100 PAGE_READONLY_X | ||
124 | #define __P101 PAGE_READONLY_X | ||
125 | #define __P110 PAGE_COPY_X | ||
126 | #define __P111 PAGE_COPY_X | ||
127 | |||
128 | #define __S000 PAGE_NONE | ||
129 | #define __S001 PAGE_READONLY | ||
130 | #define __S010 PAGE_SHARED | ||
131 | #define __S011 PAGE_SHARED | ||
132 | #define __S100 PAGE_READONLY_X | ||
133 | #define __S101 PAGE_READONLY_X | ||
134 | #define __S110 PAGE_SHARED_X | ||
135 | #define __S111 PAGE_SHARED_X | ||
136 | |||
137 | #ifndef __ASSEMBLY__ | ||
138 | |||
139 | /* | ||
140 | * ZERO_PAGE is a global shared page that is always zero: used | ||
141 | * for zero-mapped memory areas etc.. | ||
142 | */ | ||
143 | extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)]; | ||
144 | #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) | ||
145 | #endif /* __ASSEMBLY__ */ | ||
146 | |||
147 | #ifdef CONFIG_HUGETLB_PAGE | ||
148 | |||
149 | #define HAVE_ARCH_UNMAPPED_AREA | ||
150 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN | ||
151 | |||
152 | #endif | ||
153 | |||
154 | #ifndef __ASSEMBLY__ | ||
155 | |||
156 | /* | ||
157 | * Conversion functions: convert a page and protection to a page entry, | ||
158 | * and a page entry and page directory to the page they refer to. | ||
159 | * | ||
160 | * mk_pte takes a (struct page *) as input | ||
161 | */ | ||
162 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
163 | |||
164 | static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) | ||
165 | { | ||
166 | pte_t pte; | ||
167 | |||
168 | |||
169 | pte_val(pte) = (pfn << PTE_RPN_SHIFT) | pgprot_val(pgprot); | ||
170 | return pte; | ||
171 | } | ||
172 | |||
173 | #define pte_modify(_pte, newprot) \ | ||
174 | (__pte((pte_val(_pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))) | ||
175 | |||
176 | #define pte_none(pte) ((pte_val(pte) & ~_PAGE_HPTEFLAGS) == 0) | ||
177 | #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) | ||
178 | |||
179 | /* pte_clear moved to later in this file */ | ||
180 | |||
181 | #define pte_pfn(x) ((unsigned long)((pte_val(x)>>PTE_RPN_SHIFT))) | ||
182 | #define pte_page(x) pfn_to_page(pte_pfn(x)) | ||
183 | |||
184 | #define PMD_BAD_BITS (PTE_TABLE_SIZE-1) | ||
185 | #define PUD_BAD_BITS (PMD_TABLE_SIZE-1) | ||
186 | |||
187 | #define pmd_set(pmdp, pmdval) (pmd_val(*(pmdp)) = (pmdval)) | ||
188 | #define pmd_none(pmd) (!pmd_val(pmd)) | ||
189 | #define pmd_bad(pmd) (!is_kernel_addr(pmd_val(pmd)) \ | ||
190 | || (pmd_val(pmd) & PMD_BAD_BITS)) | ||
191 | #define pmd_present(pmd) (pmd_val(pmd) != 0) | ||
192 | #define pmd_clear(pmdp) (pmd_val(*(pmdp)) = 0) | ||
193 | #define pmd_page_vaddr(pmd) (pmd_val(pmd) & ~PMD_MASKED_BITS) | ||
194 | #define pmd_page(pmd) virt_to_page(pmd_page_vaddr(pmd)) | ||
195 | |||
196 | #define pud_set(pudp, pudval) (pud_val(*(pudp)) = (pudval)) | ||
197 | #define pud_none(pud) (!pud_val(pud)) | ||
198 | #define pud_bad(pud) (!is_kernel_addr(pud_val(pud)) \ | ||
199 | || (pud_val(pud) & PUD_BAD_BITS)) | ||
200 | #define pud_present(pud) (pud_val(pud) != 0) | ||
201 | #define pud_clear(pudp) (pud_val(*(pudp)) = 0) | ||
202 | #define pud_page_vaddr(pud) (pud_val(pud) & ~PUD_MASKED_BITS) | ||
203 | #define pud_page(pud) virt_to_page(pud_page_vaddr(pud)) | ||
204 | |||
205 | #define pgd_set(pgdp, pudp) ({pgd_val(*(pgdp)) = (unsigned long)(pudp);}) | ||
206 | |||
207 | /* | ||
208 | * Find an entry in a page-table-directory. We combine the address region | ||
209 | * (the high order N bits) and the pgd portion of the address. | ||
210 | */ | ||
211 | /* to avoid overflow in free_pgtables we don't use PTRS_PER_PGD here */ | ||
212 | #define pgd_index(address) (((address) >> (PGDIR_SHIFT)) & 0x1ff) | ||
213 | |||
214 | #define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) | ||
215 | |||
216 | #define pmd_offset(pudp,addr) \ | ||
217 | (((pmd_t *) pud_page_vaddr(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) | ||
218 | |||
219 | #define pte_offset_kernel(dir,addr) \ | ||
220 | (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) | ||
221 | |||
222 | #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) | ||
223 | #define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir), (addr)) | ||
224 | #define pte_unmap(pte) do { } while(0) | ||
225 | #define pte_unmap_nested(pte) do { } while(0) | ||
226 | |||
227 | /* to find an entry in a kernel page-table-directory */ | ||
228 | /* This now only contains the vmalloc pages */ | ||
229 | #define pgd_offset_k(address) pgd_offset(&init_mm, address) | ||
230 | |||
231 | /* | ||
232 | * The following only work if pte_present() is true. | ||
233 | * Undefined behaviour if not.. | ||
234 | */ | ||
235 | static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER;} | ||
236 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW;} | ||
237 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC;} | ||
238 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY;} | ||
239 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED;} | ||
240 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE;} | ||
241 | |||
242 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } | ||
243 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } | ||
244 | |||
245 | static inline pte_t pte_rdprotect(pte_t pte) { | ||
246 | pte_val(pte) &= ~_PAGE_USER; return pte; } | ||
247 | static inline pte_t pte_exprotect(pte_t pte) { | ||
248 | pte_val(pte) &= ~_PAGE_EXEC; return pte; } | ||
249 | static inline pte_t pte_wrprotect(pte_t pte) { | ||
250 | pte_val(pte) &= ~(_PAGE_RW); return pte; } | ||
251 | static inline pte_t pte_mkclean(pte_t pte) { | ||
252 | pte_val(pte) &= ~(_PAGE_DIRTY); return pte; } | ||
253 | static inline pte_t pte_mkold(pte_t pte) { | ||
254 | pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } | ||
255 | static inline pte_t pte_mkread(pte_t pte) { | ||
256 | pte_val(pte) |= _PAGE_USER; return pte; } | ||
257 | static inline pte_t pte_mkexec(pte_t pte) { | ||
258 | pte_val(pte) |= _PAGE_USER | _PAGE_EXEC; return pte; } | ||
259 | static inline pte_t pte_mkwrite(pte_t pte) { | ||
260 | pte_val(pte) |= _PAGE_RW; return pte; } | ||
261 | static inline pte_t pte_mkdirty(pte_t pte) { | ||
262 | pte_val(pte) |= _PAGE_DIRTY; return pte; } | ||
263 | static inline pte_t pte_mkyoung(pte_t pte) { | ||
264 | pte_val(pte) |= _PAGE_ACCESSED; return pte; } | ||
265 | static inline pte_t pte_mkhuge(pte_t pte) { | ||
266 | return pte; } | ||
267 | |||
268 | /* Atomic PTE updates */ | ||
269 | static inline unsigned long pte_update(struct mm_struct *mm, | ||
270 | unsigned long addr, | ||
271 | pte_t *ptep, unsigned long clr, | ||
272 | int huge) | ||
273 | { | ||
274 | unsigned long old, tmp; | ||
275 | |||
276 | __asm__ __volatile__( | ||
277 | "1: ldarx %0,0,%3 # pte_update\n\ | ||
278 | andi. %1,%0,%6\n\ | ||
279 | bne- 1b \n\ | ||
280 | andc %1,%0,%4 \n\ | ||
281 | stdcx. %1,0,%3 \n\ | ||
282 | bne- 1b" | ||
283 | : "=&r" (old), "=&r" (tmp), "=m" (*ptep) | ||
284 | : "r" (ptep), "r" (clr), "m" (*ptep), "i" (_PAGE_BUSY) | ||
285 | : "cc" ); | ||
286 | |||
287 | if (old & _PAGE_HASHPTE) | ||
288 | hpte_need_flush(mm, addr, ptep, old, huge); | ||
289 | return old; | ||
290 | } | ||
291 | |||
292 | static inline int __ptep_test_and_clear_young(struct mm_struct *mm, | ||
293 | unsigned long addr, pte_t *ptep) | ||
294 | { | ||
295 | unsigned long old; | ||
296 | |||
297 | if ((pte_val(*ptep) & (_PAGE_ACCESSED | _PAGE_HASHPTE)) == 0) | ||
298 | return 0; | ||
299 | old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0); | ||
300 | return (old & _PAGE_ACCESSED) != 0; | ||
301 | } | ||
302 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG | ||
303 | #define ptep_test_and_clear_young(__vma, __addr, __ptep) \ | ||
304 | ({ \ | ||
305 | int __r; \ | ||
306 | __r = __ptep_test_and_clear_young((__vma)->vm_mm, __addr, __ptep); \ | ||
307 | __r; \ | ||
308 | }) | ||
309 | |||
310 | /* | ||
311 | * On RW/DIRTY bit transitions we can avoid flushing the hpte. For the | ||
312 | * moment we always flush but we need to fix hpte_update and test if the | ||
313 | * optimisation is worth it. | ||
314 | */ | ||
315 | static inline int __ptep_test_and_clear_dirty(struct mm_struct *mm, | ||
316 | unsigned long addr, pte_t *ptep) | ||
317 | { | ||
318 | unsigned long old; | ||
319 | |||
320 | if ((pte_val(*ptep) & _PAGE_DIRTY) == 0) | ||
321 | return 0; | ||
322 | old = pte_update(mm, addr, ptep, _PAGE_DIRTY, 0); | ||
323 | return (old & _PAGE_DIRTY) != 0; | ||
324 | } | ||
325 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY | ||
326 | #define ptep_test_and_clear_dirty(__vma, __addr, __ptep) \ | ||
327 | ({ \ | ||
328 | int __r; \ | ||
329 | __r = __ptep_test_and_clear_dirty((__vma)->vm_mm, __addr, __ptep); \ | ||
330 | __r; \ | ||
331 | }) | ||
332 | |||
333 | #define __HAVE_ARCH_PTEP_SET_WRPROTECT | ||
334 | static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, | ||
335 | pte_t *ptep) | ||
336 | { | ||
337 | unsigned long old; | ||
338 | |||
339 | if ((pte_val(*ptep) & _PAGE_RW) == 0) | ||
340 | return; | ||
341 | old = pte_update(mm, addr, ptep, _PAGE_RW, 0); | ||
342 | } | ||
343 | |||
344 | /* | ||
345 | * We currently remove entries from the hashtable regardless of whether | ||
346 | * the entry was young or dirty. The generic routines only flush if the | ||
347 | * entry was young or dirty which is not good enough. | ||
348 | * | ||
349 | * We should be more intelligent about this but for the moment we override | ||
350 | * these functions and force a tlb flush unconditionally | ||
351 | */ | ||
352 | #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH | ||
353 | #define ptep_clear_flush_young(__vma, __address, __ptep) \ | ||
354 | ({ \ | ||
355 | int __young = __ptep_test_and_clear_young((__vma)->vm_mm, __address, \ | ||
356 | __ptep); \ | ||
357 | __young; \ | ||
358 | }) | ||
359 | |||
360 | #define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH | ||
361 | #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ | ||
362 | ({ \ | ||
363 | int __dirty = __ptep_test_and_clear_dirty((__vma)->vm_mm, __address, \ | ||
364 | __ptep); \ | ||
365 | __dirty; \ | ||
366 | }) | ||
367 | |||
368 | #define __HAVE_ARCH_PTEP_GET_AND_CLEAR | ||
369 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, | ||
370 | unsigned long addr, pte_t *ptep) | ||
371 | { | ||
372 | unsigned long old = pte_update(mm, addr, ptep, ~0UL, 0); | ||
373 | return __pte(old); | ||
374 | } | ||
375 | |||
376 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, | ||
377 | pte_t * ptep) | ||
378 | { | ||
379 | pte_update(mm, addr, ptep, ~0UL, 0); | ||
380 | } | ||
381 | |||
382 | /* | ||
383 | * set_pte stores a linux PTE into the linux page table. | ||
384 | */ | ||
385 | static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, | ||
386 | pte_t *ptep, pte_t pte) | ||
387 | { | ||
388 | if (pte_present(*ptep)) | ||
389 | pte_clear(mm, addr, ptep); | ||
390 | pte = __pte(pte_val(pte) & ~_PAGE_HPTEFLAGS); | ||
391 | *ptep = pte; | ||
392 | } | ||
393 | |||
394 | /* Set the dirty and/or accessed bits atomically in a linux PTE, this | ||
395 | * function doesn't need to flush the hash entry | ||
396 | */ | ||
397 | #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS | ||
398 | static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty) | ||
399 | { | ||
400 | unsigned long bits = pte_val(entry) & | ||
401 | (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC); | ||
402 | unsigned long old, tmp; | ||
403 | |||
404 | __asm__ __volatile__( | ||
405 | "1: ldarx %0,0,%4\n\ | ||
406 | andi. %1,%0,%6\n\ | ||
407 | bne- 1b \n\ | ||
408 | or %0,%3,%0\n\ | ||
409 | stdcx. %0,0,%4\n\ | ||
410 | bne- 1b" | ||
411 | :"=&r" (old), "=&r" (tmp), "=m" (*ptep) | ||
412 | :"r" (bits), "r" (ptep), "m" (*ptep), "i" (_PAGE_BUSY) | ||
413 | :"cc"); | ||
414 | } | ||
415 | #define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \ | ||
416 | do { \ | ||
417 | __ptep_set_access_flags(__ptep, __entry, __dirty); \ | ||
418 | flush_tlb_page_nohash(__vma, __address); \ | ||
419 | } while(0) | ||
420 | |||
421 | /* | ||
422 | * Macro to mark a page protection value as "uncacheable". | ||
423 | */ | ||
424 | #define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED)) | ||
425 | |||
426 | struct file; | ||
427 | extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | ||
428 | unsigned long size, pgprot_t vma_prot); | ||
429 | #define __HAVE_PHYS_MEM_ACCESS_PROT | ||
430 | |||
431 | #define __HAVE_ARCH_PTE_SAME | ||
432 | #define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HPTEFLAGS) == 0) | ||
433 | |||
434 | #define pte_ERROR(e) \ | ||
435 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) | ||
436 | #define pmd_ERROR(e) \ | ||
437 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e)) | ||
438 | #define pgd_ERROR(e) \ | ||
439 | printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) | ||
440 | |||
441 | extern pgd_t swapper_pg_dir[]; | ||
442 | |||
443 | extern void paging_init(void); | ||
444 | |||
445 | /* Encode and de-code a swap entry */ | ||
446 | #define __swp_type(entry) (((entry).val >> 1) & 0x3f) | ||
447 | #define __swp_offset(entry) ((entry).val >> 8) | ||
448 | #define __swp_entry(type, offset) ((swp_entry_t){((type)<< 1)|((offset)<<8)}) | ||
449 | #define __pte_to_swp_entry(pte) ((swp_entry_t){pte_val(pte) >> PTE_RPN_SHIFT}) | ||
450 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val << PTE_RPN_SHIFT }) | ||
451 | #define pte_to_pgoff(pte) (pte_val(pte) >> PTE_RPN_SHIFT) | ||
452 | #define pgoff_to_pte(off) ((pte_t) {((off) << PTE_RPN_SHIFT)|_PAGE_FILE}) | ||
453 | #define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_RPN_SHIFT) | ||
454 | |||
455 | /* | ||
456 | * kern_addr_valid is intended to indicate whether an address is a valid | ||
457 | * kernel address. Most 32-bit archs define it as always true (like this) | ||
458 | * but most 64-bit archs actually perform a test. What should we do here? | ||
459 | * The only use is in fs/ncpfs/dir.c | ||
460 | */ | ||
461 | #define kern_addr_valid(addr) (1) | ||
462 | |||
463 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
464 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
465 | |||
466 | void pgtable_cache_init(void); | ||
467 | |||
468 | /* | ||
469 | * find_linux_pte returns the address of a linux pte for a given | ||
470 | * effective address and directory. If not found, it returns zero. | ||
471 | */static inline pte_t *find_linux_pte(pgd_t *pgdir, unsigned long ea) | ||
472 | { | ||
473 | pgd_t *pg; | ||
474 | pud_t *pu; | ||
475 | pmd_t *pm; | ||
476 | pte_t *pt = NULL; | ||
477 | |||
478 | pg = pgdir + pgd_index(ea); | ||
479 | if (!pgd_none(*pg)) { | ||
480 | pu = pud_offset(pg, ea); | ||
481 | if (!pud_none(*pu)) { | ||
482 | pm = pmd_offset(pu, ea); | ||
483 | if (pmd_present(*pm)) | ||
484 | pt = pte_offset_kernel(pm, ea); | ||
485 | } | ||
486 | } | ||
487 | return pt; | ||
488 | } | ||
489 | |||
490 | #endif /* __ASSEMBLY__ */ | ||
491 | |||
492 | #endif /* _ASM_POWERPC_PGTABLE_PPC64_H_ */ | ||
diff --git a/include/asm-powerpc/pgtable.h b/include/asm-powerpc/pgtable.h index 19edb6982b81..78bf4ae712a6 100644 --- a/include/asm-powerpc/pgtable.h +++ b/include/asm-powerpc/pgtable.h | |||
@@ -2,502 +2,15 @@ | |||
2 | #define _ASM_POWERPC_PGTABLE_H | 2 | #define _ASM_POWERPC_PGTABLE_H |
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | 4 | ||
5 | #ifndef CONFIG_PPC64 | 5 | #if defined(CONFIG_PPC64) |
6 | #include <asm-ppc/pgtable.h> | 6 | # include <asm/pgtable-ppc64.h> |
7 | #else | 7 | #else |
8 | 8 | # include <asm/pgtable-ppc32.h> | |
9 | /* | ||
10 | * This file contains the functions and defines necessary to modify and use | ||
11 | * the ppc64 hashed page table. | ||
12 | */ | ||
13 | |||
14 | #ifndef __ASSEMBLY__ | ||
15 | #include <linux/stddef.h> | ||
16 | #include <asm/processor.h> /* For TASK_SIZE */ | ||
17 | #include <asm/mmu.h> | ||
18 | #include <asm/page.h> | ||
19 | #include <asm/tlbflush.h> | ||
20 | struct mm_struct; | ||
21 | #endif /* __ASSEMBLY__ */ | ||
22 | |||
23 | #ifdef CONFIG_PPC_64K_PAGES | ||
24 | #include <asm/pgtable-64k.h> | ||
25 | #else | ||
26 | #include <asm/pgtable-4k.h> | ||
27 | #endif | ||
28 | |||
29 | #define FIRST_USER_ADDRESS 0 | ||
30 | |||
31 | /* | ||
32 | * Size of EA range mapped by our pagetables. | ||
33 | */ | ||
34 | #define PGTABLE_EADDR_SIZE (PTE_INDEX_SIZE + PMD_INDEX_SIZE + \ | ||
35 | PUD_INDEX_SIZE + PGD_INDEX_SIZE + PAGE_SHIFT) | ||
36 | #define PGTABLE_RANGE (1UL << PGTABLE_EADDR_SIZE) | ||
37 | |||
38 | #if TASK_SIZE_USER64 > PGTABLE_RANGE | ||
39 | #error TASK_SIZE_USER64 exceeds pagetable range | ||
40 | #endif | ||
41 | |||
42 | #if TASK_SIZE_USER64 > (1UL << (USER_ESID_BITS + SID_SHIFT)) | ||
43 | #error TASK_SIZE_USER64 exceeds user VSID range | ||
44 | #endif | 9 | #endif |
45 | 10 | ||
46 | /* | ||
47 | * Define the address range of the vmalloc VM area. | ||
48 | */ | ||
49 | #define VMALLOC_START ASM_CONST(0xD000000000000000) | ||
50 | #define VMALLOC_SIZE ASM_CONST(0x80000000000) | ||
51 | #define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE) | ||
52 | |||
53 | /* | ||
54 | * Define the address range of the imalloc VM area. | ||
55 | */ | ||
56 | #define PHBS_IO_BASE VMALLOC_END | ||
57 | #define IMALLOC_BASE (PHBS_IO_BASE + 0x80000000ul) /* Reserve 2 gigs for PHBs */ | ||
58 | #define IMALLOC_END (VMALLOC_START + PGTABLE_RANGE) | ||
59 | |||
60 | /* | ||
61 | * Region IDs | ||
62 | */ | ||
63 | #define REGION_SHIFT 60UL | ||
64 | #define REGION_MASK (0xfUL << REGION_SHIFT) | ||
65 | #define REGION_ID(ea) (((unsigned long)(ea)) >> REGION_SHIFT) | ||
66 | |||
67 | #define VMALLOC_REGION_ID (REGION_ID(VMALLOC_START)) | ||
68 | #define KERNEL_REGION_ID (REGION_ID(PAGE_OFFSET)) | ||
69 | #define USER_REGION_ID (0UL) | ||
70 | |||
71 | /* | ||
72 | * Common bits in a linux-style PTE. These match the bits in the | ||
73 | * (hardware-defined) PowerPC PTE as closely as possible. Additional | ||
74 | * bits may be defined in pgtable-*.h | ||
75 | */ | ||
76 | #define _PAGE_PRESENT 0x0001 /* software: pte contains a translation */ | ||
77 | #define _PAGE_USER 0x0002 /* matches one of the PP bits */ | ||
78 | #define _PAGE_FILE 0x0002 /* (!present only) software: pte holds file offset */ | ||
79 | #define _PAGE_EXEC 0x0004 /* No execute on POWER4 and newer (we invert) */ | ||
80 | #define _PAGE_GUARDED 0x0008 | ||
81 | #define _PAGE_COHERENT 0x0010 /* M: enforce memory coherence (SMP systems) */ | ||
82 | #define _PAGE_NO_CACHE 0x0020 /* I: cache inhibit */ | ||
83 | #define _PAGE_WRITETHRU 0x0040 /* W: cache write-through */ | ||
84 | #define _PAGE_DIRTY 0x0080 /* C: page changed */ | ||
85 | #define _PAGE_ACCESSED 0x0100 /* R: page referenced */ | ||
86 | #define _PAGE_RW 0x0200 /* software: user write access allowed */ | ||
87 | #define _PAGE_HASHPTE 0x0400 /* software: pte has an associated HPTE */ | ||
88 | #define _PAGE_BUSY 0x0800 /* software: PTE & hash are busy */ | ||
89 | |||
90 | #define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_COHERENT) | ||
91 | |||
92 | #define _PAGE_WRENABLE (_PAGE_RW | _PAGE_DIRTY) | ||
93 | |||
94 | /* __pgprot defined in asm-powerpc/page.h */ | ||
95 | #define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED) | ||
96 | |||
97 | #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER) | ||
98 | #define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_RW | _PAGE_USER | _PAGE_EXEC) | ||
99 | #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
100 | #define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
101 | #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER) | ||
102 | #define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) | ||
103 | #define PAGE_KERNEL __pgprot(_PAGE_BASE | _PAGE_WRENABLE) | ||
104 | #define PAGE_KERNEL_CI __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \ | ||
105 | _PAGE_WRENABLE | _PAGE_NO_CACHE | _PAGE_GUARDED) | ||
106 | #define PAGE_KERNEL_EXEC __pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_EXEC) | ||
107 | |||
108 | #define PAGE_AGP __pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_NO_CACHE) | ||
109 | #define HAVE_PAGE_AGP | ||
110 | |||
111 | /* PTEIDX nibble */ | ||
112 | #define _PTEIDX_SECONDARY 0x8 | ||
113 | #define _PTEIDX_GROUP_IX 0x7 | ||
114 | |||
115 | |||
116 | /* | ||
117 | * POWER4 and newer have per page execute protection, older chips can only | ||
118 | * do this on a segment (256MB) basis. | ||
119 | * | ||
120 | * Also, write permissions imply read permissions. | ||
121 | * This is the closest we can get.. | ||
122 | * | ||
123 | * Note due to the way vm flags are laid out, the bits are XWR | ||
124 | */ | ||
125 | #define __P000 PAGE_NONE | ||
126 | #define __P001 PAGE_READONLY | ||
127 | #define __P010 PAGE_COPY | ||
128 | #define __P011 PAGE_COPY | ||
129 | #define __P100 PAGE_READONLY_X | ||
130 | #define __P101 PAGE_READONLY_X | ||
131 | #define __P110 PAGE_COPY_X | ||
132 | #define __P111 PAGE_COPY_X | ||
133 | |||
134 | #define __S000 PAGE_NONE | ||
135 | #define __S001 PAGE_READONLY | ||
136 | #define __S010 PAGE_SHARED | ||
137 | #define __S011 PAGE_SHARED | ||
138 | #define __S100 PAGE_READONLY_X | ||
139 | #define __S101 PAGE_READONLY_X | ||
140 | #define __S110 PAGE_SHARED_X | ||
141 | #define __S111 PAGE_SHARED_X | ||
142 | |||
143 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
144 | |||
145 | /* | ||
146 | * ZERO_PAGE is a global shared page that is always zero: used | ||
147 | * for zero-mapped memory areas etc.. | ||
148 | */ | ||
149 | extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)]; | ||
150 | #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) | ||
151 | #endif /* __ASSEMBLY__ */ | ||
152 | |||
153 | #ifdef CONFIG_HUGETLB_PAGE | ||
154 | |||
155 | #define HAVE_ARCH_UNMAPPED_AREA | ||
156 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN | ||
157 | |||
158 | #endif | ||
159 | |||
160 | #ifndef __ASSEMBLY__ | ||
161 | |||
162 | /* | ||
163 | * Conversion functions: convert a page and protection to a page entry, | ||
164 | * and a page entry and page directory to the page they refer to. | ||
165 | * | ||
166 | * mk_pte takes a (struct page *) as input | ||
167 | */ | ||
168 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
169 | |||
170 | static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) | ||
171 | { | ||
172 | pte_t pte; | ||
173 | |||
174 | |||
175 | pte_val(pte) = (pfn << PTE_RPN_SHIFT) | pgprot_val(pgprot); | ||
176 | return pte; | ||
177 | } | ||
178 | |||
179 | #define pte_modify(_pte, newprot) \ | ||
180 | (__pte((pte_val(_pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))) | ||
181 | |||
182 | #define pte_none(pte) ((pte_val(pte) & ~_PAGE_HPTEFLAGS) == 0) | ||
183 | #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) | ||
184 | |||
185 | /* pte_clear moved to later in this file */ | ||
186 | |||
187 | #define pte_pfn(x) ((unsigned long)((pte_val(x)>>PTE_RPN_SHIFT))) | ||
188 | #define pte_page(x) pfn_to_page(pte_pfn(x)) | ||
189 | |||
190 | #define PMD_BAD_BITS (PTE_TABLE_SIZE-1) | ||
191 | #define PUD_BAD_BITS (PMD_TABLE_SIZE-1) | ||
192 | |||
193 | #define pmd_set(pmdp, pmdval) (pmd_val(*(pmdp)) = (pmdval)) | ||
194 | #define pmd_none(pmd) (!pmd_val(pmd)) | ||
195 | #define pmd_bad(pmd) (!is_kernel_addr(pmd_val(pmd)) \ | ||
196 | || (pmd_val(pmd) & PMD_BAD_BITS)) | ||
197 | #define pmd_present(pmd) (pmd_val(pmd) != 0) | ||
198 | #define pmd_clear(pmdp) (pmd_val(*(pmdp)) = 0) | ||
199 | #define pmd_page_vaddr(pmd) (pmd_val(pmd) & ~PMD_MASKED_BITS) | ||
200 | #define pmd_page(pmd) virt_to_page(pmd_page_vaddr(pmd)) | ||
201 | |||
202 | #define pud_set(pudp, pudval) (pud_val(*(pudp)) = (pudval)) | ||
203 | #define pud_none(pud) (!pud_val(pud)) | ||
204 | #define pud_bad(pud) (!is_kernel_addr(pud_val(pud)) \ | ||
205 | || (pud_val(pud) & PUD_BAD_BITS)) | ||
206 | #define pud_present(pud) (pud_val(pud) != 0) | ||
207 | #define pud_clear(pudp) (pud_val(*(pudp)) = 0) | ||
208 | #define pud_page_vaddr(pud) (pud_val(pud) & ~PUD_MASKED_BITS) | ||
209 | #define pud_page(pud) virt_to_page(pud_page_vaddr(pud)) | ||
210 | |||
211 | #define pgd_set(pgdp, pudp) ({pgd_val(*(pgdp)) = (unsigned long)(pudp);}) | ||
212 | |||
213 | /* | ||
214 | * Find an entry in a page-table-directory. We combine the address region | ||
215 | * (the high order N bits) and the pgd portion of the address. | ||
216 | */ | ||
217 | /* to avoid overflow in free_pgtables we don't use PTRS_PER_PGD here */ | ||
218 | #define pgd_index(address) (((address) >> (PGDIR_SHIFT)) & 0x1ff) | ||
219 | |||
220 | #define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) | ||
221 | |||
222 | #define pmd_offset(pudp,addr) \ | ||
223 | (((pmd_t *) pud_page_vaddr(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) | ||
224 | |||
225 | #define pte_offset_kernel(dir,addr) \ | ||
226 | (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) | ||
227 | |||
228 | #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) | ||
229 | #define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir), (addr)) | ||
230 | #define pte_unmap(pte) do { } while(0) | ||
231 | #define pte_unmap_nested(pte) do { } while(0) | ||
232 | |||
233 | /* to find an entry in a kernel page-table-directory */ | ||
234 | /* This now only contains the vmalloc pages */ | ||
235 | #define pgd_offset_k(address) pgd_offset(&init_mm, address) | ||
236 | |||
237 | /* | ||
238 | * The following only work if pte_present() is true. | ||
239 | * Undefined behaviour if not.. | ||
240 | */ | ||
241 | static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER;} | ||
242 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW;} | ||
243 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC;} | ||
244 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY;} | ||
245 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED;} | ||
246 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE;} | ||
247 | |||
248 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } | ||
249 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } | ||
250 | |||
251 | static inline pte_t pte_rdprotect(pte_t pte) { | ||
252 | pte_val(pte) &= ~_PAGE_USER; return pte; } | ||
253 | static inline pte_t pte_exprotect(pte_t pte) { | ||
254 | pte_val(pte) &= ~_PAGE_EXEC; return pte; } | ||
255 | static inline pte_t pte_wrprotect(pte_t pte) { | ||
256 | pte_val(pte) &= ~(_PAGE_RW); return pte; } | ||
257 | static inline pte_t pte_mkclean(pte_t pte) { | ||
258 | pte_val(pte) &= ~(_PAGE_DIRTY); return pte; } | ||
259 | static inline pte_t pte_mkold(pte_t pte) { | ||
260 | pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } | ||
261 | static inline pte_t pte_mkread(pte_t pte) { | ||
262 | pte_val(pte) |= _PAGE_USER; return pte; } | ||
263 | static inline pte_t pte_mkexec(pte_t pte) { | ||
264 | pte_val(pte) |= _PAGE_USER | _PAGE_EXEC; return pte; } | ||
265 | static inline pte_t pte_mkwrite(pte_t pte) { | ||
266 | pte_val(pte) |= _PAGE_RW; return pte; } | ||
267 | static inline pte_t pte_mkdirty(pte_t pte) { | ||
268 | pte_val(pte) |= _PAGE_DIRTY; return pte; } | ||
269 | static inline pte_t pte_mkyoung(pte_t pte) { | ||
270 | pte_val(pte) |= _PAGE_ACCESSED; return pte; } | ||
271 | static inline pte_t pte_mkhuge(pte_t pte) { | ||
272 | return pte; } | ||
273 | |||
274 | /* Atomic PTE updates */ | ||
275 | static inline unsigned long pte_update(struct mm_struct *mm, | ||
276 | unsigned long addr, | ||
277 | pte_t *ptep, unsigned long clr, | ||
278 | int huge) | ||
279 | { | ||
280 | unsigned long old, tmp; | ||
281 | |||
282 | __asm__ __volatile__( | ||
283 | "1: ldarx %0,0,%3 # pte_update\n\ | ||
284 | andi. %1,%0,%6\n\ | ||
285 | bne- 1b \n\ | ||
286 | andc %1,%0,%4 \n\ | ||
287 | stdcx. %1,0,%3 \n\ | ||
288 | bne- 1b" | ||
289 | : "=&r" (old), "=&r" (tmp), "=m" (*ptep) | ||
290 | : "r" (ptep), "r" (clr), "m" (*ptep), "i" (_PAGE_BUSY) | ||
291 | : "cc" ); | ||
292 | |||
293 | if (old & _PAGE_HASHPTE) | ||
294 | hpte_need_flush(mm, addr, ptep, old, huge); | ||
295 | return old; | ||
296 | } | ||
297 | |||
298 | static inline int __ptep_test_and_clear_young(struct mm_struct *mm, | ||
299 | unsigned long addr, pte_t *ptep) | ||
300 | { | ||
301 | unsigned long old; | ||
302 | |||
303 | if ((pte_val(*ptep) & (_PAGE_ACCESSED | _PAGE_HASHPTE)) == 0) | ||
304 | return 0; | ||
305 | old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0); | ||
306 | return (old & _PAGE_ACCESSED) != 0; | ||
307 | } | ||
308 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG | ||
309 | #define ptep_test_and_clear_young(__vma, __addr, __ptep) \ | ||
310 | ({ \ | ||
311 | int __r; \ | ||
312 | __r = __ptep_test_and_clear_young((__vma)->vm_mm, __addr, __ptep); \ | ||
313 | __r; \ | ||
314 | }) | ||
315 | |||
316 | /* | ||
317 | * On RW/DIRTY bit transitions we can avoid flushing the hpte. For the | ||
318 | * moment we always flush but we need to fix hpte_update and test if the | ||
319 | * optimisation is worth it. | ||
320 | */ | ||
321 | static inline int __ptep_test_and_clear_dirty(struct mm_struct *mm, | ||
322 | unsigned long addr, pte_t *ptep) | ||
323 | { | ||
324 | unsigned long old; | ||
325 | |||
326 | if ((pte_val(*ptep) & _PAGE_DIRTY) == 0) | ||
327 | return 0; | ||
328 | old = pte_update(mm, addr, ptep, _PAGE_DIRTY, 0); | ||
329 | return (old & _PAGE_DIRTY) != 0; | ||
330 | } | ||
331 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY | ||
332 | #define ptep_test_and_clear_dirty(__vma, __addr, __ptep) \ | ||
333 | ({ \ | ||
334 | int __r; \ | ||
335 | __r = __ptep_test_and_clear_dirty((__vma)->vm_mm, __addr, __ptep); \ | ||
336 | __r; \ | ||
337 | }) | ||
338 | |||
339 | #define __HAVE_ARCH_PTEP_SET_WRPROTECT | ||
340 | static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, | ||
341 | pte_t *ptep) | ||
342 | { | ||
343 | unsigned long old; | ||
344 | |||
345 | if ((pte_val(*ptep) & _PAGE_RW) == 0) | ||
346 | return; | ||
347 | old = pte_update(mm, addr, ptep, _PAGE_RW, 0); | ||
348 | } | ||
349 | |||
350 | /* | ||
351 | * We currently remove entries from the hashtable regardless of whether | ||
352 | * the entry was young or dirty. The generic routines only flush if the | ||
353 | * entry was young or dirty which is not good enough. | ||
354 | * | ||
355 | * We should be more intelligent about this but for the moment we override | ||
356 | * these functions and force a tlb flush unconditionally | ||
357 | */ | ||
358 | #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH | ||
359 | #define ptep_clear_flush_young(__vma, __address, __ptep) \ | ||
360 | ({ \ | ||
361 | int __young = __ptep_test_and_clear_young((__vma)->vm_mm, __address, \ | ||
362 | __ptep); \ | ||
363 | __young; \ | ||
364 | }) | ||
365 | |||
366 | #define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH | ||
367 | #define ptep_clear_flush_dirty(__vma, __address, __ptep) \ | ||
368 | ({ \ | ||
369 | int __dirty = __ptep_test_and_clear_dirty((__vma)->vm_mm, __address, \ | ||
370 | __ptep); \ | ||
371 | __dirty; \ | ||
372 | }) | ||
373 | |||
374 | #define __HAVE_ARCH_PTEP_GET_AND_CLEAR | ||
375 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, | ||
376 | unsigned long addr, pte_t *ptep) | ||
377 | { | ||
378 | unsigned long old = pte_update(mm, addr, ptep, ~0UL, 0); | ||
379 | return __pte(old); | ||
380 | } | ||
381 | |||
382 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, | ||
383 | pte_t * ptep) | ||
384 | { | ||
385 | pte_update(mm, addr, ptep, ~0UL, 0); | ||
386 | } | ||
387 | |||
388 | /* | ||
389 | * set_pte stores a linux PTE into the linux page table. | ||
390 | */ | ||
391 | static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, | ||
392 | pte_t *ptep, pte_t pte) | ||
393 | { | ||
394 | if (pte_present(*ptep)) | ||
395 | pte_clear(mm, addr, ptep); | ||
396 | pte = __pte(pte_val(pte) & ~_PAGE_HPTEFLAGS); | ||
397 | *ptep = pte; | ||
398 | } | ||
399 | |||
400 | /* Set the dirty and/or accessed bits atomically in a linux PTE, this | ||
401 | * function doesn't need to flush the hash entry | ||
402 | */ | ||
403 | #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS | ||
404 | static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty) | ||
405 | { | ||
406 | unsigned long bits = pte_val(entry) & | ||
407 | (_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC); | ||
408 | unsigned long old, tmp; | ||
409 | |||
410 | __asm__ __volatile__( | ||
411 | "1: ldarx %0,0,%4\n\ | ||
412 | andi. %1,%0,%6\n\ | ||
413 | bne- 1b \n\ | ||
414 | or %0,%3,%0\n\ | ||
415 | stdcx. %0,0,%4\n\ | ||
416 | bne- 1b" | ||
417 | :"=&r" (old), "=&r" (tmp), "=m" (*ptep) | ||
418 | :"r" (bits), "r" (ptep), "m" (*ptep), "i" (_PAGE_BUSY) | ||
419 | :"cc"); | ||
420 | } | ||
421 | #define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \ | ||
422 | do { \ | ||
423 | __ptep_set_access_flags(__ptep, __entry, __dirty); \ | ||
424 | flush_tlb_page_nohash(__vma, __address); \ | ||
425 | } while(0) | ||
426 | |||
427 | /* | ||
428 | * Macro to mark a page protection value as "uncacheable". | ||
429 | */ | ||
430 | #define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED)) | ||
431 | |||
432 | struct file; | ||
433 | extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | ||
434 | unsigned long size, pgprot_t vma_prot); | ||
435 | #define __HAVE_PHYS_MEM_ACCESS_PROT | ||
436 | |||
437 | #define __HAVE_ARCH_PTE_SAME | ||
438 | #define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HPTEFLAGS) == 0) | ||
439 | |||
440 | #define pte_ERROR(e) \ | ||
441 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) | ||
442 | #define pmd_ERROR(e) \ | ||
443 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e)) | ||
444 | #define pgd_ERROR(e) \ | ||
445 | printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) | ||
446 | |||
447 | extern pgd_t swapper_pg_dir[]; | ||
448 | |||
449 | extern void paging_init(void); | ||
450 | |||
451 | /* Encode and de-code a swap entry */ | ||
452 | #define __swp_type(entry) (((entry).val >> 1) & 0x3f) | ||
453 | #define __swp_offset(entry) ((entry).val >> 8) | ||
454 | #define __swp_entry(type, offset) ((swp_entry_t){((type)<< 1)|((offset)<<8)}) | ||
455 | #define __pte_to_swp_entry(pte) ((swp_entry_t){pte_val(pte) >> PTE_RPN_SHIFT}) | ||
456 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val << PTE_RPN_SHIFT }) | ||
457 | #define pte_to_pgoff(pte) (pte_val(pte) >> PTE_RPN_SHIFT) | ||
458 | #define pgoff_to_pte(off) ((pte_t) {((off) << PTE_RPN_SHIFT)|_PAGE_FILE}) | ||
459 | #define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_RPN_SHIFT) | ||
460 | |||
461 | /* | ||
462 | * kern_addr_valid is intended to indicate whether an address is a valid | ||
463 | * kernel address. Most 32-bit archs define it as always true (like this) | ||
464 | * but most 64-bit archs actually perform a test. What should we do here? | ||
465 | * The only use is in fs/ncpfs/dir.c | ||
466 | */ | ||
467 | #define kern_addr_valid(addr) (1) | ||
468 | |||
469 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
470 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
471 | |||
472 | void pgtable_cache_init(void); | ||
473 | |||
474 | /* | ||
475 | * find_linux_pte returns the address of a linux pte for a given | ||
476 | * effective address and directory. If not found, it returns zero. | ||
477 | */static inline pte_t *find_linux_pte(pgd_t *pgdir, unsigned long ea) | ||
478 | { | ||
479 | pgd_t *pg; | ||
480 | pud_t *pu; | ||
481 | pmd_t *pm; | ||
482 | pte_t *pt = NULL; | ||
483 | |||
484 | pg = pgdir + pgd_index(ea); | ||
485 | if (!pgd_none(*pg)) { | ||
486 | pu = pud_offset(pg, ea); | ||
487 | if (!pud_none(*pu)) { | ||
488 | pm = pmd_offset(pu, ea); | ||
489 | if (pmd_present(*pm)) | ||
490 | pt = pte_offset_kernel(pm, ea); | ||
491 | } | ||
492 | } | ||
493 | return pt; | ||
494 | } | ||
495 | |||
496 | |||
497 | #include <asm-generic/pgtable.h> | 12 | #include <asm-generic/pgtable.h> |
498 | |||
499 | #endif /* __ASSEMBLY__ */ | 13 | #endif /* __ASSEMBLY__ */ |
500 | 14 | ||
501 | #endif /* CONFIG_PPC64 */ | ||
502 | #endif /* __KERNEL__ */ | 15 | #endif /* __KERNEL__ */ |
503 | #endif /* _ASM_POWERPC_PGTABLE_H */ | 16 | #endif /* _ASM_POWERPC_PGTABLE_H */ |
diff --git a/include/asm-powerpc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h index d3599cc9aa74..d43d91beba9b 100644 --- a/include/asm-powerpc/pmac_feature.h +++ b/include/asm-powerpc/pmac_feature.h | |||
@@ -146,7 +146,7 @@ struct device_node; | |||
146 | static inline long pmac_call_feature(int selector, struct device_node* node, | 146 | static inline long pmac_call_feature(int selector, struct device_node* node, |
147 | long param, long value) | 147 | long param, long value) |
148 | { | 148 | { |
149 | if (!ppc_md.feature_call) | 149 | if (!ppc_md.feature_call || !machine_is(powermac)) |
150 | return -ENODEV; | 150 | return -ENODEV; |
151 | return ppc_md.feature_call(selector, node, param, value); | 151 | return ppc_md.feature_call(selector, node, param, value); |
152 | } | 152 | } |
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index ec400f608e16..6845af93ba91 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/atomic.h> | 22 | #include <asm/atomic.h> |
23 | #include <asm/io.h> | ||
24 | 23 | ||
25 | /* Definitions used by the flattened device tree */ | 24 | /* Definitions used by the flattened device tree */ |
26 | #define OF_DT_HEADER 0xd00dfeed /* marker */ | 25 | #define OF_DT_HEADER 0xd00dfeed /* marker */ |
@@ -334,30 +333,17 @@ extern int of_irq_map_one(struct device_node *device, int index, | |||
334 | struct pci_dev; | 333 | struct pci_dev; |
335 | extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); | 334 | extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); |
336 | 335 | ||
337 | static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) | 336 | extern int of_irq_to_resource(struct device_node *dev, int index, |
338 | { | 337 | struct resource *r); |
339 | int irq = irq_of_parse_and_map(dev, index); | ||
340 | |||
341 | /* Only dereference the resource if both the | ||
342 | * resource and the irq are valid. */ | ||
343 | if (r && irq != NO_IRQ) { | ||
344 | r->start = r->end = irq; | ||
345 | r->flags = IORESOURCE_IRQ; | ||
346 | } | ||
347 | |||
348 | return irq; | ||
349 | } | ||
350 | |||
351 | static inline void __iomem *of_iomap(struct device_node *np, int index) | ||
352 | { | ||
353 | struct resource res; | ||
354 | |||
355 | if (of_address_to_resource(np, index, &res)) | ||
356 | return NULL; | ||
357 | |||
358 | return ioremap(res.start, 1 + res.end - res.start); | ||
359 | } | ||
360 | 338 | ||
339 | /** | ||
340 | * of_iomap - Maps the memory mapped IO for a given device_node | ||
341 | * @device: the device whose io range will be mapped | ||
342 | * @index: index of the io range | ||
343 | * | ||
344 | * Returns a pointer to the mapped memory | ||
345 | */ | ||
346 | extern void __iomem *of_iomap(struct device_node *device, int index); | ||
361 | 347 | ||
362 | #endif /* __KERNEL__ */ | 348 | #endif /* __KERNEL__ */ |
363 | #endif /* _POWERPC_PROM_H */ | 349 | #endif /* _POWERPC_PROM_H */ |
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h index 821581a8b643..13c372df99e8 100644 --- a/include/asm-powerpc/ps3.h +++ b/include/asm-powerpc/ps3.h | |||
@@ -167,26 +167,31 @@ enum ps3_cpu_binding { | |||
167 | PS3_BINDING_CPU_1 = 1, | 167 | PS3_BINDING_CPU_1 = 1, |
168 | }; | 168 | }; |
169 | 169 | ||
170 | int ps3_alloc_io_irq(enum ps3_cpu_binding cpu, unsigned int interrupt_id, | 170 | int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet, |
171 | unsigned int *virq); | 171 | unsigned int *virq); |
172 | int ps3_free_io_irq(unsigned int virq); | 172 | int ps3_virq_destroy(unsigned int virq); |
173 | int ps3_alloc_event_irq(enum ps3_cpu_binding cpu, unsigned int *virq); | 173 | int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet, |
174 | int ps3_free_event_irq(unsigned int virq); | 174 | unsigned int *virq); |
175 | int ps3_irq_plug_destroy(unsigned int virq); | ||
176 | int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq); | ||
177 | int ps3_event_receive_port_destroy(unsigned int virq); | ||
175 | int ps3_send_event_locally(unsigned int virq); | 178 | int ps3_send_event_locally(unsigned int virq); |
176 | int ps3_connect_event_irq(enum ps3_cpu_binding cpu, | 179 | |
177 | const struct ps3_device_id *did, unsigned int interrupt_id, | 180 | int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id, |
178 | unsigned int *virq); | 181 | unsigned int *virq); |
179 | int ps3_disconnect_event_irq(const struct ps3_device_id *did, | 182 | int ps3_io_irq_destroy(unsigned int virq); |
180 | unsigned int interrupt_id, unsigned int virq); | 183 | int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp, |
181 | int ps3_alloc_vuart_irq(enum ps3_cpu_binding cpu, void* virt_addr_bmp, | ||
182 | unsigned int *virq); | 184 | unsigned int *virq); |
183 | int ps3_free_vuart_irq(unsigned int virq); | 185 | int ps3_vuart_irq_destroy(unsigned int virq); |
184 | int ps3_alloc_spe_irq(enum ps3_cpu_binding cpu, unsigned long spe_id, | 186 | int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id, |
185 | unsigned int class, unsigned int *virq); | 187 | unsigned int class, unsigned int *virq); |
186 | int ps3_free_spe_irq(unsigned int virq); | 188 | int ps3_spe_irq_destroy(unsigned int virq); |
187 | int ps3_alloc_irq(enum ps3_cpu_binding cpu, unsigned long outlet, | 189 | |
190 | int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu, | ||
191 | const struct ps3_device_id *did, unsigned int interrupt_id, | ||
188 | unsigned int *virq); | 192 | unsigned int *virq); |
189 | int ps3_free_irq(unsigned int virq); | 193 | int ps3_sb_event_receive_port_destroy(const struct ps3_device_id *did, |
194 | unsigned int interrupt_id, unsigned int virq); | ||
190 | 195 | ||
191 | /* lv1 result codes */ | 196 | /* lv1 result codes */ |
192 | 197 | ||
diff --git a/include/asm-powerpc/suspend.h b/include/asm-powerpc/suspend.h new file mode 100644 index 000000000000..cbf2c9404c37 --- /dev/null +++ b/include/asm-powerpc/suspend.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #ifndef __ASM_POWERPC_SUSPEND_H | ||
2 | #define __ASM_POWERPC_SUSPEND_H | ||
3 | |||
4 | static inline int arch_prepare_suspend(void) { return 0; } | ||
5 | |||
6 | void save_processor_state(void); | ||
7 | void restore_processor_state(void); | ||
8 | |||
9 | #endif /* __ASM_POWERPC_SUSPEND_H */ | ||
diff --git a/include/asm-powerpc/tsi108.h b/include/asm-powerpc/tsi108.h index 4e95d153be84..f8b60793b7a9 100644 --- a/include/asm-powerpc/tsi108.h +++ b/include/asm-powerpc/tsi108.h | |||
@@ -68,8 +68,17 @@ | |||
68 | #define TSI108_PB_ERRCS_ES (1 << 1) | 68 | #define TSI108_PB_ERRCS_ES (1 << 1) |
69 | #define TSI108_PB_ISR_PBS_RD_ERR (1 << 8) | 69 | #define TSI108_PB_ISR_PBS_RD_ERR (1 << 8) |
70 | 70 | ||
71 | #define TSI108_PCI_CFG_BASE_PHYS (0xfb000000) | ||
72 | #define TSI108_PCI_CFG_SIZE (0x01000000) | 71 | #define TSI108_PCI_CFG_SIZE (0x01000000) |
72 | |||
73 | /* | ||
74 | * PHY Configuration Options | ||
75 | * | ||
76 | * Specify "bcm54xx" in the compatible property of your device tree phy | ||
77 | * nodes if your board uses the Broadcom PHYs | ||
78 | */ | ||
79 | #define TSI108_PHY_MV88E 0 /* Marvel 88Exxxx PHY */ | ||
80 | #define TSI108_PHY_BCM54XX 1 /* Broardcom BCM54xx PHY */ | ||
81 | |||
73 | /* Global variables */ | 82 | /* Global variables */ |
74 | 83 | ||
75 | extern u32 tsi108_pci_cfg_base; | 84 | extern u32 tsi108_pci_cfg_base; |
@@ -93,6 +102,7 @@ typedef struct { | |||
93 | u16 phy; /* phy address */ | 102 | u16 phy; /* phy address */ |
94 | u16 irq_num; /* irq number */ | 103 | u16 irq_num; /* irq number */ |
95 | u8 mac_addr[6]; /* phy mac address */ | 104 | u8 mac_addr[6]; /* phy mac address */ |
105 | u16 phy_type; /* type of phy on board */ | ||
96 | } hw_info; | 106 | } hw_info; |
97 | 107 | ||
98 | extern u32 get_vir_csrbase(void); | 108 | extern u32 get_vir_csrbase(void); |
diff --git a/include/asm-powerpc/tsi108_pci.h b/include/asm-powerpc/tsi108_pci.h new file mode 100644 index 000000000000..a9f92f73232c --- /dev/null +++ b/include/asm-powerpc/tsi108_pci.h | |||
@@ -0,0 +1,45 @@ | |||
1 | /* | ||
2 | * Copyright 2007 IBM Corp | ||
3 | * | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License as | ||
7 | * published by the Free Software Foundation; either version 2 of | ||
8 | * the License, or (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | ||
18 | * MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #ifndef _ASM_PPC_TSI108_PCI_H | ||
22 | #define _ASM_PPC_TSI108_PCI_H | ||
23 | |||
24 | #include <asm/tsi108.h> | ||
25 | |||
26 | /* Register definitions */ | ||
27 | #define TSI108_PCI_P2O_BAR0 (TSI108_PCI_OFFSET + 0x10) | ||
28 | #define TSI108_PCI_P2O_BAR0_UPPER (TSI108_PCI_OFFSET + 0x14) | ||
29 | #define TSI108_PCI_P2O_BAR2 (TSI108_PCI_OFFSET + 0x18) | ||
30 | #define TSI108_PCI_P2O_BAR2_UPPER (TSI108_PCI_OFFSET + 0x1c) | ||
31 | #define TSI108_PCI_P2O_PAGE_SIZES (TSI108_PCI_OFFSET + 0x4c) | ||
32 | #define TSI108_PCI_PFAB_BAR0 (TSI108_PCI_OFFSET + 0x204) | ||
33 | #define TSI108_PCI_PFAB_BAR0_UPPER (TSI108_PCI_OFFSET + 0x208) | ||
34 | #define TSI108_PCI_PFAB_IO (TSI108_PCI_OFFSET + 0x20c) | ||
35 | #define TSI108_PCI_PFAB_IO_UPPER (TSI108_PCI_OFFSET + 0x210) | ||
36 | #define TSI108_PCI_PFAB_MEM32 (TSI108_PCI_OFFSET + 0x214) | ||
37 | #define TSI108_PCI_PFAB_PFM3 (TSI108_PCI_OFFSET + 0x220) | ||
38 | #define TSI108_PCI_PFAB_PFM4 (TSI108_PCI_OFFSET + 0x230) | ||
39 | |||
40 | extern int tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary); | ||
41 | extern void tsi108_pci_int_init(struct device_node *node); | ||
42 | extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc); | ||
43 | extern void tsi108_clear_pci_cfg_error(void); | ||
44 | |||
45 | #endif /* _ASM_PPC_TSI108_PCI_H */ | ||
diff --git a/include/asm-powerpc/udbg.h b/include/asm-powerpc/udbg.h index d03d8557f706..ce9d82fb7b68 100644 --- a/include/asm-powerpc/udbg.h +++ b/include/asm-powerpc/udbg.h | |||
@@ -47,6 +47,7 @@ extern void __init udbg_init_rtas_panel(void); | |||
47 | extern void __init udbg_init_rtas_console(void); | 47 | extern void __init udbg_init_rtas_console(void); |
48 | extern void __init udbg_init_debug_beat(void); | 48 | extern void __init udbg_init_debug_beat(void); |
49 | extern void __init udbg_init_btext(void); | 49 | extern void __init udbg_init_btext(void); |
50 | extern void __init udbg_init_44x_as1(void); | ||
50 | 51 | ||
51 | #endif /* __KERNEL__ */ | 52 | #endif /* __KERNEL__ */ |
52 | #endif /* _ASM_POWERPC_UDBG_H */ | 53 | #endif /* _ASM_POWERPC_UDBG_H */ |