diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/cputhreads.h | 71 | ||||
-rw-r--r-- | include/asm-powerpc/firmware.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/iommu.h | 3 | ||||
-rw-r--r-- | include/asm-powerpc/mmu-hash64.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/of_platform.h | 10 | ||||
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 159 | ||||
-rw-r--r-- | include/asm-powerpc/ppc-pci.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/reg.h | 6 | ||||
-rw-r--r-- | include/asm-powerpc/smu.h | 132 | ||||
-rw-r--r-- | include/linux/of.h | 4 |
10 files changed, 278 insertions, 114 deletions
diff --git a/include/asm-powerpc/cputhreads.h b/include/asm-powerpc/cputhreads.h new file mode 100644 index 000000000000..8485c28b5f47 --- /dev/null +++ b/include/asm-powerpc/cputhreads.h | |||
@@ -0,0 +1,71 @@ | |||
1 | #ifndef _ASM_POWERPC_CPUTHREADS_H | ||
2 | #define _ASM_POWERPC_CPUTHREADS_H | ||
3 | |||
4 | #include <linux/cpumask.h> | ||
5 | |||
6 | /* | ||
7 | * Mapping of threads to cores | ||
8 | */ | ||
9 | |||
10 | #ifdef CONFIG_SMP | ||
11 | extern int threads_per_core; | ||
12 | extern int threads_shift; | ||
13 | extern cpumask_t threads_core_mask; | ||
14 | #else | ||
15 | #define threads_per_core 1 | ||
16 | #define threads_shift 0 | ||
17 | #define threads_core_mask (CPU_MASK_CPU0) | ||
18 | #endif | ||
19 | |||
20 | /* cpu_thread_mask_to_cores - Return a cpumask of one per cores | ||
21 | * hit by the argument | ||
22 | * | ||
23 | * @threads: a cpumask of threads | ||
24 | * | ||
25 | * This function returns a cpumask which will have one "cpu" (or thread) | ||
26 | * bit set for each core that has at least one thread set in the argument. | ||
27 | * | ||
28 | * This can typically be used for things like IPI for tlb invalidations | ||
29 | * since those need to be done only once per core/TLB | ||
30 | */ | ||
31 | static inline cpumask_t cpu_thread_mask_to_cores(cpumask_t threads) | ||
32 | { | ||
33 | cpumask_t tmp, res; | ||
34 | int i; | ||
35 | |||
36 | res = CPU_MASK_NONE; | ||
37 | for (i = 0; i < NR_CPUS; i += threads_per_core) { | ||
38 | cpus_shift_right(tmp, threads_core_mask, i); | ||
39 | if (cpus_intersects(threads, tmp)) | ||
40 | cpu_set(i, res); | ||
41 | } | ||
42 | return res; | ||
43 | } | ||
44 | |||
45 | static inline int cpu_nr_cores(void) | ||
46 | { | ||
47 | return NR_CPUS >> threads_shift; | ||
48 | } | ||
49 | |||
50 | static inline cpumask_t cpu_online_cores_map(void) | ||
51 | { | ||
52 | return cpu_thread_mask_to_cores(cpu_online_map); | ||
53 | } | ||
54 | |||
55 | static inline int cpu_thread_to_core(int cpu) | ||
56 | { | ||
57 | return cpu >> threads_shift; | ||
58 | } | ||
59 | |||
60 | static inline int cpu_thread_in_core(int cpu) | ||
61 | { | ||
62 | return cpu & (threads_per_core - 1); | ||
63 | } | ||
64 | |||
65 | static inline int cpu_first_thread_in_core(int cpu) | ||
66 | { | ||
67 | return cpu & ~(threads_per_core - 1); | ||
68 | } | ||
69 | |||
70 | #endif /* _ASM_POWERPC_CPUTHREADS_H */ | ||
71 | |||
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h index 3671c128f271..1e41bd1c8502 100644 --- a/include/asm-powerpc/firmware.h +++ b/include/asm-powerpc/firmware.h | |||
@@ -64,7 +64,7 @@ enum { | |||
64 | FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, | 64 | FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, |
65 | FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, | 65 | FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, |
66 | FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT, | 66 | FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT, |
67 | FW_FEATURE_CELLEB_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_BEAT, | 67 | FW_FEATURE_CELLEB_ALWAYS = 0, |
68 | FW_FEATURE_NATIVE_POSSIBLE = 0, | 68 | FW_FEATURE_NATIVE_POSSIBLE = 0, |
69 | FW_FEATURE_NATIVE_ALWAYS = 0, | 69 | FW_FEATURE_NATIVE_ALWAYS = 0, |
70 | FW_FEATURE_POSSIBLE = | 70 | FW_FEATURE_POSSIBLE = |
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index 4a82fdccee92..7a3cef785abd 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
@@ -69,10 +69,9 @@ struct iommu_table { | |||
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct scatterlist; | 71 | struct scatterlist; |
72 | struct device_node; | ||
73 | 72 | ||
74 | /* Frees table for an individual device node */ | 73 | /* Frees table for an individual device node */ |
75 | extern void iommu_free_table(struct device_node *dn); | 74 | extern void iommu_free_table(struct iommu_table *tbl, const char *node_name); |
76 | 75 | ||
77 | /* Initializes an iommu_table based in values set in the passed-in | 76 | /* Initializes an iommu_table based in values set in the passed-in |
78 | * structure | 77 | * structure |
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h index 82328dec2b52..12e5e773c67e 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
@@ -180,6 +180,7 @@ extern int mmu_vmalloc_psize; | |||
180 | extern int mmu_io_psize; | 180 | extern int mmu_io_psize; |
181 | extern int mmu_kernel_ssize; | 181 | extern int mmu_kernel_ssize; |
182 | extern int mmu_highuser_ssize; | 182 | extern int mmu_highuser_ssize; |
183 | extern u16 mmu_slb_size; | ||
183 | 184 | ||
184 | /* | 185 | /* |
185 | * If the processor supports 64k normal pages but not 64k cache | 186 | * If the processor supports 64k normal pages but not 64k cache |
diff --git a/include/asm-powerpc/of_platform.h b/include/asm-powerpc/of_platform.h index 80e6fad28b4f..d20a4cd08fa1 100644 --- a/include/asm-powerpc/of_platform.h +++ b/include/asm-powerpc/of_platform.h | |||
@@ -15,8 +15,14 @@ | |||
15 | #include <linux/of_platform.h> | 15 | #include <linux/of_platform.h> |
16 | 16 | ||
17 | /* Platform drivers register/unregister */ | 17 | /* Platform drivers register/unregister */ |
18 | extern int of_register_platform_driver(struct of_platform_driver *drv); | 18 | static inline int of_register_platform_driver(struct of_platform_driver *drv) |
19 | extern void of_unregister_platform_driver(struct of_platform_driver *drv); | 19 | { |
20 | return of_register_driver(drv, &of_platform_bus_type); | ||
21 | } | ||
22 | static inline void of_unregister_platform_driver(struct of_platform_driver *drv) | ||
23 | { | ||
24 | of_unregister_driver(drv); | ||
25 | } | ||
20 | 26 | ||
21 | /* Platform devices and busses creation */ | 27 | /* Platform devices and busses creation */ |
22 | extern struct of_device *of_platform_device_create(struct device_node *np, | 28 | extern struct of_device *of_platform_device_create(struct device_node *np, |
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index d8bdc79db12e..f139f2a44b19 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
@@ -1,15 +1,17 @@ | |||
1 | #ifndef _ASM_POWERPC_PCI_BRIDGE_H | 1 | #ifndef _ASM_POWERPC_PCI_BRIDGE_H |
2 | #define _ASM_POWERPC_PCI_BRIDGE_H | 2 | #define _ASM_POWERPC_PCI_BRIDGE_H |
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | 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 | ||
7 | * as published by the Free Software Foundation; either version | ||
8 | * 2 of the License, or (at your option) any later version. | ||
9 | */ | ||
5 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
6 | #include <linux/list.h> | 11 | #include <linux/list.h> |
7 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
8 | 13 | ||
9 | #ifndef CONFIG_PPC64 | ||
10 | |||
11 | struct device_node; | 14 | struct device_node; |
12 | struct pci_controller; | ||
13 | 15 | ||
14 | /* | 16 | /* |
15 | * Structure of a PCI controller (host bridge) | 17 | * Structure of a PCI controller (host bridge) |
@@ -17,26 +19,38 @@ struct pci_controller; | |||
17 | struct pci_controller { | 19 | struct pci_controller { |
18 | struct pci_bus *bus; | 20 | struct pci_bus *bus; |
19 | char is_dynamic; | 21 | char is_dynamic; |
20 | void *arch_data; | 22 | #ifdef CONFIG_PPC64 |
23 | int node; | ||
24 | #endif | ||
25 | struct device_node *dn; | ||
21 | struct list_head list_node; | 26 | struct list_head list_node; |
22 | struct device *parent; | 27 | struct device *parent; |
23 | 28 | ||
24 | int first_busno; | 29 | int first_busno; |
25 | int last_busno; | 30 | int last_busno; |
31 | #ifndef CONFIG_PPC64 | ||
26 | int self_busno; | 32 | int self_busno; |
33 | #endif | ||
27 | 34 | ||
28 | void __iomem *io_base_virt; | 35 | void __iomem *io_base_virt; |
36 | #ifdef CONFIG_PPC64 | ||
37 | void *io_base_alloc; | ||
38 | #endif | ||
29 | resource_size_t io_base_phys; | 39 | resource_size_t io_base_phys; |
30 | 40 | ||
31 | /* Some machines (PReP) have a non 1:1 mapping of | 41 | /* Some machines (PReP) have a non 1:1 mapping of |
32 | * the PCI memory space in the CPU bus space | 42 | * the PCI memory space in the CPU bus space |
33 | */ | 43 | */ |
34 | resource_size_t pci_mem_offset; | 44 | resource_size_t pci_mem_offset; |
45 | #ifdef CONFIG_PPC64 | ||
46 | unsigned long pci_io_size; | ||
47 | #endif | ||
35 | 48 | ||
36 | struct pci_ops *ops; | 49 | struct pci_ops *ops; |
37 | volatile unsigned int __iomem *cfg_addr; | 50 | volatile unsigned int __iomem *cfg_addr; |
38 | volatile void __iomem *cfg_data; | 51 | volatile void __iomem *cfg_data; |
39 | 52 | ||
53 | #ifndef CONFIG_PPC64 | ||
40 | /* | 54 | /* |
41 | * Used for variants of PCI indirect handling and possible quirks: | 55 | * Used for variants of PCI indirect handling and possible quirks: |
42 | * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1 | 56 | * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1 |
@@ -51,21 +65,30 @@ struct pci_controller { | |||
51 | * set. | 65 | * set. |
52 | * BIG_ENDIAN - cfg_addr is a big endian register | 66 | * BIG_ENDIAN - cfg_addr is a big endian register |
53 | */ | 67 | */ |
54 | #define PPC_INDIRECT_TYPE_SET_CFG_TYPE (0x00000001) | 68 | #define PPC_INDIRECT_TYPE_SET_CFG_TYPE 0x00000001 |
55 | #define PPC_INDIRECT_TYPE_EXT_REG (0x00000002) | 69 | #define PPC_INDIRECT_TYPE_EXT_REG 0x00000002 |
56 | #define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS (0x00000004) | 70 | #define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS 0x00000004 |
57 | #define PPC_INDIRECT_TYPE_NO_PCIE_LINK (0x00000008) | 71 | #define PPC_INDIRECT_TYPE_NO_PCIE_LINK 0x00000008 |
58 | #define PPC_INDIRECT_TYPE_BIG_ENDIAN (0x00000010) | 72 | #define PPC_INDIRECT_TYPE_BIG_ENDIAN 0x00000010 |
59 | u32 indirect_type; | 73 | u32 indirect_type; |
60 | 74 | #endif /* !CONFIG_PPC64 */ | |
61 | /* Currently, we limit ourselves to 1 IO range and 3 mem | 75 | /* Currently, we limit ourselves to 1 IO range and 3 mem |
62 | * ranges since the common pci_bus structure can't handle more | 76 | * ranges since the common pci_bus structure can't handle more |
63 | */ | 77 | */ |
64 | struct resource io_resource; | 78 | struct resource io_resource; |
65 | struct resource mem_resources[3]; | 79 | struct resource mem_resources[3]; |
66 | int global_number; /* PCI domain number */ | 80 | int global_number; /* PCI domain number */ |
81 | #ifdef CONFIG_PPC64 | ||
82 | unsigned long buid; | ||
83 | unsigned long dma_window_base_cur; | ||
84 | unsigned long dma_window_size; | ||
85 | |||
86 | void *private_data; | ||
87 | #endif /* CONFIG_PPC64 */ | ||
67 | }; | 88 | }; |
68 | 89 | ||
90 | #ifndef CONFIG_PPC64 | ||
91 | |||
69 | static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) | 92 | static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) |
70 | { | 93 | { |
71 | return bus->sysdata; | 94 | return bus->sysdata; |
@@ -81,18 +104,18 @@ static inline int isa_vaddr_is_ioport(void __iomem *address) | |||
81 | 104 | ||
82 | /* These are used for config access before all the PCI probing | 105 | /* These are used for config access before all the PCI probing |
83 | has been done. */ | 106 | has been done. */ |
84 | int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn, | 107 | extern int early_read_config_byte(struct pci_controller *hose, int bus, |
85 | int where, u8 *val); | 108 | int dev_fn, int where, u8 *val); |
86 | int early_read_config_word(struct pci_controller *hose, int bus, int dev_fn, | 109 | extern int early_read_config_word(struct pci_controller *hose, int bus, |
87 | int where, u16 *val); | 110 | int dev_fn, int where, u16 *val); |
88 | int early_read_config_dword(struct pci_controller *hose, int bus, int dev_fn, | 111 | extern int early_read_config_dword(struct pci_controller *hose, int bus, |
89 | int where, u32 *val); | 112 | int dev_fn, int where, u32 *val); |
90 | int early_write_config_byte(struct pci_controller *hose, int bus, int dev_fn, | 113 | extern int early_write_config_byte(struct pci_controller *hose, int bus, |
91 | int where, u8 val); | 114 | int dev_fn, int where, u8 val); |
92 | int early_write_config_word(struct pci_controller *hose, int bus, int dev_fn, | 115 | extern int early_write_config_word(struct pci_controller *hose, int bus, |
93 | int where, u16 val); | 116 | int dev_fn, int where, u16 val); |
94 | int early_write_config_dword(struct pci_controller *hose, int bus, int dev_fn, | 117 | extern int early_write_config_dword(struct pci_controller *hose, int bus, |
95 | int where, u32 val); | 118 | int dev_fn, int where, u32 val); |
96 | 119 | ||
97 | extern int early_find_capability(struct pci_controller *hose, int bus, | 120 | extern int early_find_capability(struct pci_controller *hose, int bus, |
98 | int dev_fn, int cap); | 121 | int dev_fn, int cap); |
@@ -104,62 +127,12 @@ extern void setup_grackle(struct pci_controller *hose); | |||
104 | extern void __init update_bridge_resource(struct pci_dev *dev, | 127 | extern void __init update_bridge_resource(struct pci_dev *dev, |
105 | struct resource *res); | 128 | struct resource *res); |
106 | 129 | ||
107 | #else | 130 | #else /* CONFIG_PPC64 */ |
108 | |||
109 | |||
110 | /* | ||
111 | * This program is free software; you can redistribute it and/or | ||
112 | * modify it under the terms of the GNU General Public License | ||
113 | * as published by the Free Software Foundation; either version | ||
114 | * 2 of the License, or (at your option) any later version. | ||
115 | */ | ||
116 | |||
117 | /* | ||
118 | * Structure of a PCI controller (host bridge) | ||
119 | */ | ||
120 | struct pci_controller { | ||
121 | struct pci_bus *bus; | ||
122 | char is_dynamic; | ||
123 | int node; | ||
124 | void *arch_data; | ||
125 | struct list_head list_node; | ||
126 | struct device *parent; | ||
127 | |||
128 | int first_busno; | ||
129 | int last_busno; | ||
130 | |||
131 | void __iomem *io_base_virt; | ||
132 | void *io_base_alloc; | ||
133 | resource_size_t io_base_phys; | ||
134 | |||
135 | /* Some machines have a non 1:1 mapping of | ||
136 | * the PCI memory space in the CPU bus space | ||
137 | */ | ||
138 | resource_size_t pci_mem_offset; | ||
139 | unsigned long pci_io_size; | ||
140 | |||
141 | struct pci_ops *ops; | ||
142 | volatile unsigned int __iomem *cfg_addr; | ||
143 | volatile void __iomem *cfg_data; | ||
144 | |||
145 | /* Currently, we limit ourselves to 1 IO range and 3 mem | ||
146 | * ranges since the common pci_bus structure can't handle more | ||
147 | */ | ||
148 | struct resource io_resource; | ||
149 | struct resource mem_resources[3]; | ||
150 | int global_number; | ||
151 | unsigned long buid; | ||
152 | unsigned long dma_window_base_cur; | ||
153 | unsigned long dma_window_size; | ||
154 | |||
155 | void *private_data; | ||
156 | }; | ||
157 | 131 | ||
158 | /* | 132 | /* |
159 | * PCI stuff, for nodes representing PCI devices, pointed to | 133 | * PCI stuff, for nodes representing PCI devices, pointed to |
160 | * by device_node->data. | 134 | * by device_node->data. |
161 | */ | 135 | */ |
162 | struct pci_controller; | ||
163 | struct iommu_table; | 136 | struct iommu_table; |
164 | 137 | ||
165 | struct pci_dn { | 138 | struct pci_dn { |
@@ -179,9 +152,9 @@ struct pci_dn { | |||
179 | int eeh_mode; /* See eeh.h for possible EEH_MODEs */ | 152 | int eeh_mode; /* See eeh.h for possible EEH_MODEs */ |
180 | int eeh_config_addr; | 153 | int eeh_config_addr; |
181 | int eeh_pe_config_addr; /* new-style partition endpoint address */ | 154 | int eeh_pe_config_addr; /* new-style partition endpoint address */ |
182 | int eeh_check_count; /* # times driver ignored error */ | 155 | int eeh_check_count; /* # times driver ignored error */ |
183 | int eeh_freeze_count; /* # times this device froze up. */ | 156 | int eeh_freeze_count; /* # times this device froze up. */ |
184 | int eeh_false_positives; /* # times this device reported #ff's */ | 157 | int eeh_false_positives; /* # times this device reported #ff's */ |
185 | u32 config_space[16]; /* saved PCI config space */ | 158 | u32 config_space[16]; /* saved PCI config space */ |
186 | #endif | 159 | #endif |
187 | }; | 160 | }; |
@@ -189,7 +162,7 @@ struct pci_dn { | |||
189 | /* Get the pointer to a device_node's pci_dn */ | 162 | /* Get the pointer to a device_node's pci_dn */ |
190 | #define PCI_DN(dn) ((struct pci_dn *) (dn)->data) | 163 | #define PCI_DN(dn) ((struct pci_dn *) (dn)->data) |
191 | 164 | ||
192 | struct device_node *fetch_dev_dn(struct pci_dev *dev); | 165 | extern struct device_node *fetch_dev_dn(struct pci_dev *dev); |
193 | 166 | ||
194 | /* Get a device_node from a pci_dev. This code must be fast except | 167 | /* Get a device_node from a pci_dev. This code must be fast except |
195 | * in the case where the sysdata is incorrect and needs to be fixed | 168 | * in the case where the sysdata is incorrect and needs to be fixed |
@@ -227,14 +200,14 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) | |||
227 | } | 200 | } |
228 | 201 | ||
229 | /** Find the bus corresponding to the indicated device node */ | 202 | /** Find the bus corresponding to the indicated device node */ |
230 | struct pci_bus * pcibios_find_pci_bus(struct device_node *dn); | 203 | extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); |
231 | 204 | ||
232 | /** Remove all of the PCI devices under this bus */ | 205 | /** Remove all of the PCI devices under this bus */ |
233 | void pcibios_remove_pci_devices(struct pci_bus *bus); | 206 | extern void pcibios_remove_pci_devices(struct pci_bus *bus); |
234 | 207 | ||
235 | /** Discover new pci devices under this bus, and add them */ | 208 | /** Discover new pci devices under this bus, and add them */ |
236 | void pcibios_add_pci_devices(struct pci_bus * bus); | 209 | extern void pcibios_add_pci_devices(struct pci_bus *bus); |
237 | void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus); | 210 | extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus); |
238 | 211 | ||
239 | extern int pcibios_remove_root_bus(struct pci_controller *phb); | 212 | extern int pcibios_remove_root_bus(struct pci_controller *phb); |
240 | 213 | ||
@@ -270,20 +243,18 @@ extern int pcibios_map_io_space(struct pci_bus *bus); | |||
270 | #define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1) | 243 | #define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1) |
271 | #endif | 244 | #endif |
272 | 245 | ||
273 | #endif /* CONFIG_PPC64 */ | 246 | #endif /* CONFIG_PPC64 */ |
274 | 247 | ||
275 | /* Get the PCI host controller for an OF device */ | 248 | /* Get the PCI host controller for an OF device */ |
276 | extern struct pci_controller* | 249 | extern struct pci_controller *pci_find_hose_for_OF_device( |
277 | pci_find_hose_for_OF_device(struct device_node* node); | 250 | struct device_node* node); |
278 | 251 | ||
279 | /* Fill up host controller resources from the OF node */ | 252 | /* Fill up host controller resources from the OF node */ |
280 | extern void | 253 | extern void pci_process_bridge_OF_ranges(struct pci_controller *hose, |
281 | pci_process_bridge_OF_ranges(struct pci_controller *hose, | 254 | struct device_node *dev, int primary); |
282 | struct device_node *dev, int primary); | ||
283 | 255 | ||
284 | /* Allocate & free a PCI host bridge structure */ | 256 | /* Allocate & free a PCI host bridge structure */ |
285 | extern struct pci_controller * | 257 | extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev); |
286 | pcibios_alloc_controller(struct device_node *dev); | ||
287 | extern void pcibios_free_controller(struct pci_controller *phb); | 258 | extern void pcibios_free_controller(struct pci_controller *phb); |
288 | 259 | ||
289 | #ifdef CONFIG_PCI | 260 | #ifdef CONFIG_PCI |
@@ -298,9 +269,7 @@ static inline int pcibios_vaddr_is_ioport(void __iomem *address) | |||
298 | { | 269 | { |
299 | return 0; | 270 | return 0; |
300 | } | 271 | } |
301 | #endif | 272 | #endif /* CONFIG_PCI */ |
302 | |||
303 | 273 | ||
304 | 274 | #endif /* __KERNEL__ */ | |
305 | #endif /* __KERNEL__ */ | 275 | #endif /* _ASM_POWERPC_PCI_BRIDGE_H */ |
306 | #endif | ||
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index b847aa10074b..854ab713f56c 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h | |||
@@ -22,7 +22,6 @@ extern void pci_setup_phb_io_dynamic(struct pci_controller *hose, int primary); | |||
22 | 22 | ||
23 | 23 | ||
24 | extern struct list_head hose_list; | 24 | extern struct list_head hose_list; |
25 | extern int global_phb_number; | ||
26 | 25 | ||
27 | extern void find_and_init_phbs(void); | 26 | extern void find_and_init_phbs(void); |
28 | 27 | ||
@@ -47,9 +46,6 @@ extern void init_pci_config_tokens (void); | |||
47 | extern unsigned long get_phb_buid (struct device_node *); | 46 | extern unsigned long get_phb_buid (struct device_node *); |
48 | extern int rtas_setup_phb(struct pci_controller *phb); | 47 | extern int rtas_setup_phb(struct pci_controller *phb); |
49 | 48 | ||
50 | /* From iSeries PCI */ | ||
51 | extern void iSeries_pcibios_init(void); | ||
52 | |||
53 | extern unsigned long pci_probe_only; | 49 | extern unsigned long pci_probe_only; |
54 | 50 | ||
55 | /* ---- EEH internal-use-only related routines ---- */ | 51 | /* ---- EEH internal-use-only related routines ---- */ |
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h index e775ff1ca413..1f685047c6ff 100644 --- a/include/asm-powerpc/reg.h +++ b/include/asm-powerpc/reg.h | |||
@@ -691,12 +691,6 @@ | |||
691 | #define PV_BE 0x0070 | 691 | #define PV_BE 0x0070 |
692 | #define PV_PA6T 0x0090 | 692 | #define PV_PA6T 0x0090 |
693 | 693 | ||
694 | /* | ||
695 | * Number of entries in the SLB. If this ever changes we should handle | ||
696 | * it with a use a cpu feature fixup. | ||
697 | */ | ||
698 | #define SLB_NUM_ENTRIES 64 | ||
699 | |||
700 | /* Macros for setting and retrieving special purpose registers */ | 694 | /* Macros for setting and retrieving special purpose registers */ |
701 | #ifndef __ASSEMBLY__ | 695 | #ifndef __ASSEMBLY__ |
702 | #define mfmsr() ({unsigned long rval; \ | 696 | #define mfmsr() ({unsigned long rval; \ |
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h index e49f644ca63a..76329f451aba 100644 --- a/include/asm-powerpc/smu.h +++ b/include/asm-powerpc/smu.h | |||
@@ -173,7 +173,7 @@ | |||
173 | * Power supply control | 173 | * Power supply control |
174 | * | 174 | * |
175 | * The "sub" command is an ASCII string in the data, the | 175 | * The "sub" command is an ASCII string in the data, the |
176 | * data lenght is that of the string. | 176 | * data length is that of the string. |
177 | * | 177 | * |
178 | * The VSLEW command can be used to get or set the voltage slewing. | 178 | * The VSLEW command can be used to get or set the voltage slewing. |
179 | * - lenght 5 (only "VSLEW") : it returns "DONE" and 3 bytes of | 179 | * - lenght 5 (only "VSLEW") : it returns "DONE" and 3 bytes of |
@@ -201,20 +201,90 @@ | |||
201 | */ | 201 | */ |
202 | #define SMU_CMD_READ_ADC 0xd8 | 202 | #define SMU_CMD_READ_ADC 0xd8 |
203 | 203 | ||
204 | |||
204 | /* Misc commands | 205 | /* Misc commands |
205 | * | 206 | * |
206 | * This command seem to be a grab bag of various things | 207 | * This command seem to be a grab bag of various things |
208 | * | ||
209 | * Parameters: | ||
210 | * 1: subcommand | ||
207 | */ | 211 | */ |
208 | #define SMU_CMD_MISC_df_COMMAND 0xdf | 212 | #define SMU_CMD_MISC_df_COMMAND 0xdf |
209 | #define SMU_CMD_MISC_df_SET_DISPLAY_LIT 0x02 /* i: 1 byte */ | 213 | |
214 | /* | ||
215 | * Sets "system ready" status | ||
216 | * | ||
217 | * I did not yet understand how it exactly works or what it does. | ||
218 | * | ||
219 | * Guessing from OF code, 0x02 activates the display backlight. Apple uses/used | ||
220 | * the same codebase for all OF versions. On PowerBooks, this command would | ||
221 | * enable the backlight. For the G5s, it only activates the front LED. However, | ||
222 | * don't take this for granted. | ||
223 | * | ||
224 | * Parameters: | ||
225 | * 2: status [0x00, 0x01 or 0x02] | ||
226 | */ | ||
227 | #define SMU_CMD_MISC_df_SET_DISPLAY_LIT 0x02 | ||
228 | |||
229 | /* | ||
230 | * Sets mode of power switch. | ||
231 | * | ||
232 | * What this actually does is not yet known. Maybe it enables some interrupt. | ||
233 | * | ||
234 | * Parameters: | ||
235 | * 2: enable power switch? [0x00 or 0x01] | ||
236 | * 3 (optional): enable nmi? [0x00 or 0x01] | ||
237 | * | ||
238 | * Returns: | ||
239 | * If parameter 2 is 0x00 and parameter 3 is not specified, returns wether | ||
240 | * NMI is enabled. Otherwise unknown. | ||
241 | */ | ||
210 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 | 242 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 |
211 | 243 | ||
244 | /* Sets LED dimm offset. | ||
245 | * | ||
246 | * The front LED dimms itself during sleep. Its brightness (or, well, the PWM | ||
247 | * frequency) depends on current time. Therefore, the SMU needs to know the | ||
248 | * timezone. | ||
249 | * | ||
250 | * Parameters: | ||
251 | * 2-8: unknown (BCD coding) | ||
252 | */ | ||
253 | #define SMU_CMD_MISC_df_DIMM_OFFSET 0x99 | ||
254 | |||
255 | |||
212 | /* | 256 | /* |
213 | * Version info commands | 257 | * Version info commands |
214 | * | 258 | * |
215 | * I haven't quite tried to figure out how these work | 259 | * Parameters: |
260 | * 1 (optional): Specifies version part to retrieve | ||
261 | * | ||
262 | * Returns: | ||
263 | * Version value | ||
216 | */ | 264 | */ |
217 | #define SMU_CMD_VERSION_COMMAND 0xea | 265 | #define SMU_CMD_VERSION_COMMAND 0xea |
266 | #define SMU_VERSION_RUNNING 0x00 | ||
267 | #define SMU_VERSION_BASE 0x01 | ||
268 | #define SMU_VERSION_UPDATE 0x02 | ||
269 | |||
270 | |||
271 | /* | ||
272 | * Switches | ||
273 | * | ||
274 | * These are switches whose status seems to be known to the SMU. | ||
275 | * | ||
276 | * Parameters: | ||
277 | * none | ||
278 | * | ||
279 | * Result: | ||
280 | * Switch bits (ORed, see below) | ||
281 | */ | ||
282 | #define SMU_CMD_SWITCHES 0xdc | ||
283 | |||
284 | /* Switches bits */ | ||
285 | #define SMU_SWITCH_CASE_CLOSED 0x01 | ||
286 | #define SMU_SWITCH_AC_POWER 0x04 | ||
287 | #define SMU_SWITCH_POWER_SWITCH 0x08 | ||
218 | 288 | ||
219 | 289 | ||
220 | /* | 290 | /* |
@@ -243,10 +313,64 @@ | |||
243 | */ | 313 | */ |
244 | #define SMU_CMD_MISC_ee_COMMAND 0xee | 314 | #define SMU_CMD_MISC_ee_COMMAND 0xee |
245 | #define SMU_CMD_MISC_ee_GET_DATABLOCK_REC 0x02 | 315 | #define SMU_CMD_MISC_ee_GET_DATABLOCK_REC 0x02 |
246 | #define SMU_CMD_MISC_ee_LEDS_CTRL 0x04 /* i: 00 (00,01) [00] */ | 316 | |
317 | /* Retrieves currently used watts. | ||
318 | * | ||
319 | * Parameters: | ||
320 | * 1: 0x03 (Meaning unknown) | ||
321 | */ | ||
322 | #define SMU_CMD_MISC_ee_GET_WATTS 0x03 | ||
323 | |||
324 | #define SMU_CMD_MISC_ee_LEDS_CTRL 0x04 /* i: 00 (00,01) [00] */ | ||
247 | #define SMU_CMD_MISC_ee_GET_DATA 0x05 /* i: 00 , o: ?? */ | 325 | #define SMU_CMD_MISC_ee_GET_DATA 0x05 /* i: 00 , o: ?? */ |
248 | 326 | ||
249 | 327 | ||
328 | /* | ||
329 | * Power related commands | ||
330 | * | ||
331 | * Parameters: | ||
332 | * 1: subcommand | ||
333 | */ | ||
334 | #define SMU_CMD_POWER_EVENTS_COMMAND 0x8f | ||
335 | |||
336 | /* SMU_POWER_EVENTS subcommands */ | ||
337 | enum { | ||
338 | SMU_PWR_GET_POWERUP_EVENTS = 0x00, | ||
339 | SMU_PWR_SET_POWERUP_EVENTS = 0x01, | ||
340 | SMU_PWR_CLR_POWERUP_EVENTS = 0x02, | ||
341 | SMU_PWR_GET_WAKEUP_EVENTS = 0x03, | ||
342 | SMU_PWR_SET_WAKEUP_EVENTS = 0x04, | ||
343 | SMU_PWR_CLR_WAKEUP_EVENTS = 0x05, | ||
344 | |||
345 | /* | ||
346 | * Get last shutdown cause | ||
347 | * | ||
348 | * Returns: | ||
349 | * 1 byte (signed char): Last shutdown cause. Exact meaning unknown. | ||
350 | */ | ||
351 | SMU_PWR_LAST_SHUTDOWN_CAUSE = 0x07, | ||
352 | |||
353 | /* | ||
354 | * Sets or gets server ID. Meaning or use is unknown. | ||
355 | * | ||
356 | * Parameters: | ||
357 | * 2 (optional): Set server ID (1 byte) | ||
358 | * | ||
359 | * Returns: | ||
360 | * 1 byte (server ID?) | ||
361 | */ | ||
362 | SMU_PWR_SERVER_ID = 0x08, | ||
363 | }; | ||
364 | |||
365 | /* Power events wakeup bits */ | ||
366 | enum { | ||
367 | SMU_PWR_WAKEUP_KEY = 0x01, /* Wake on key press */ | ||
368 | SMU_PWR_WAKEUP_AC_INSERT = 0x02, /* Wake on AC adapter plug */ | ||
369 | SMU_PWR_WAKEUP_AC_CHANGE = 0x04, | ||
370 | SMU_PWR_WAKEUP_LID_OPEN = 0x08, | ||
371 | SMU_PWR_WAKEUP_RING = 0x10, | ||
372 | }; | ||
373 | |||
250 | 374 | ||
251 | /* | 375 | /* |
252 | * - Kernel side interface - | 376 | * - Kernel side interface - |
diff --git a/include/linux/of.h b/include/linux/of.h index 5c39b9270ff7..c65af7bd1e9c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
@@ -46,6 +46,10 @@ extern struct device_node *of_find_node_by_phandle(phandle handle); | |||
46 | extern struct device_node *of_get_parent(const struct device_node *node); | 46 | extern struct device_node *of_get_parent(const struct device_node *node); |
47 | extern struct device_node *of_get_next_child(const struct device_node *node, | 47 | extern struct device_node *of_get_next_child(const struct device_node *node, |
48 | struct device_node *prev); | 48 | struct device_node *prev); |
49 | #define for_each_child_of_node(parent, child) \ | ||
50 | for (child = of_get_next_child(parent, NULL); child != NULL; \ | ||
51 | child = of_get_next_child(parent, child)) | ||
52 | |||
49 | extern struct property *of_find_property(const struct device_node *np, | 53 | extern struct property *of_find_property(const struct device_node *np, |
50 | const char *name, | 54 | const char *name, |
51 | int *lenp); | 55 | int *lenp); |