diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /arch/powerpc/platforms | |
parent | 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (diff) | |
parent | f459d63e1689b16a2f5a965557e19b25bad5dbdc (diff) |
Merge branch 'dt' into next
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/85xx/p1022_ds.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/os-area.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/dlpar.c | 34 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-memory.c | 60 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 10 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/mobility.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c | 119 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 1 |
10 files changed, 75 insertions, 179 deletions
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 848a3e98e1c1..8fb12570b2f5 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c | |||
@@ -539,7 +539,7 @@ static void __init p1022_ds_setup_arch(void) | |||
539 | }; | 539 | }; |
540 | 540 | ||
541 | /* | 541 | /* |
542 | * prom_update_property() is called before | 542 | * of_update_property() is called before |
543 | * kmalloc() is available, so the 'new' object | 543 | * kmalloc() is available, so the 'new' object |
544 | * should be allocated in the global area. | 544 | * should be allocated in the global area. |
545 | * The easiest way is to do that is to | 545 | * The easiest way is to do that is to |
@@ -548,7 +548,7 @@ static void __init p1022_ds_setup_arch(void) | |||
548 | */ | 548 | */ |
549 | pr_info("p1022ds: disabling %s node", | 549 | pr_info("p1022ds: disabling %s node", |
550 | np2->full_name); | 550 | np2->full_name); |
551 | prom_update_property(np2, &nor_status); | 551 | of_update_property(np2, &nor_status); |
552 | of_node_put(np2); | 552 | of_node_put(np2); |
553 | } | 553 | } |
554 | 554 | ||
@@ -564,7 +564,7 @@ static void __init p1022_ds_setup_arch(void) | |||
564 | 564 | ||
565 | pr_info("p1022ds: disabling %s node", | 565 | pr_info("p1022ds: disabling %s node", |
566 | np2->full_name); | 566 | np2->full_name); |
567 | prom_update_property(np2, &nand_status); | 567 | of_update_property(np2, &nand_status); |
568 | of_node_put(np2); | 568 | of_node_put(np2); |
569 | } | 569 | } |
570 | 570 | ||
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c index 56d26bc4fd41..09787139834d 100644 --- a/arch/powerpc/platforms/ps3/os-area.c +++ b/arch/powerpc/platforms/ps3/os-area.c | |||
@@ -280,13 +280,13 @@ static void os_area_set_property(struct device_node *node, | |||
280 | 280 | ||
281 | if (tmp) { | 281 | if (tmp) { |
282 | pr_debug("%s:%d found %s\n", __func__, __LINE__, prop->name); | 282 | pr_debug("%s:%d found %s\n", __func__, __LINE__, prop->name); |
283 | prom_remove_property(node, tmp); | 283 | of_remove_property(node, tmp); |
284 | } | 284 | } |
285 | 285 | ||
286 | result = prom_add_property(node, prop); | 286 | result = of_add_property(node, prop); |
287 | 287 | ||
288 | if (result) | 288 | if (result) |
289 | pr_debug("%s:%d prom_set_property failed\n", __func__, | 289 | pr_debug("%s:%d of_set_property failed\n", __func__, |
290 | __LINE__); | 290 | __LINE__); |
291 | } | 291 | } |
292 | 292 | ||
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 0f1b706506ed..a1a7b9a67ffd 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c | |||
@@ -13,17 +13,16 @@ | |||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/kref.h> | 14 | #include <linux/kref.h> |
15 | #include <linux/notifier.h> | 15 | #include <linux/notifier.h> |
16 | #include <linux/proc_fs.h> | ||
17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
18 | #include <linux/cpu.h> | 17 | #include <linux/cpu.h> |
19 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | ||
20 | #include "offline_states.h" | 20 | #include "offline_states.h" |
21 | 21 | ||
22 | #include <asm/prom.h> | 22 | #include <asm/prom.h> |
23 | #include <asm/machdep.h> | 23 | #include <asm/machdep.h> |
24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
25 | #include <asm/rtas.h> | 25 | #include <asm/rtas.h> |
26 | #include <asm/pSeries_reconfig.h> | ||
27 | 26 | ||
28 | struct cc_workarea { | 27 | struct cc_workarea { |
29 | u32 drc_index; | 28 | u32 drc_index; |
@@ -255,9 +254,6 @@ static struct device_node *derive_parent(const char *path) | |||
255 | 254 | ||
256 | int dlpar_attach_node(struct device_node *dn) | 255 | int dlpar_attach_node(struct device_node *dn) |
257 | { | 256 | { |
258 | #ifdef CONFIG_PROC_DEVICETREE | ||
259 | struct proc_dir_entry *ent; | ||
260 | #endif | ||
261 | int rc; | 257 | int rc; |
262 | 258 | ||
263 | of_node_set_flag(dn, OF_DYNAMIC); | 259 | of_node_set_flag(dn, OF_DYNAMIC); |
@@ -266,44 +262,26 @@ int dlpar_attach_node(struct device_node *dn) | |||
266 | if (!dn->parent) | 262 | if (!dn->parent) |
267 | return -ENOMEM; | 263 | return -ENOMEM; |
268 | 264 | ||
269 | rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn); | 265 | rc = of_attach_node(dn); |
270 | if (rc) { | 266 | if (rc) { |
271 | printk(KERN_ERR "Failed to add device node %s\n", | 267 | printk(KERN_ERR "Failed to add device node %s\n", |
272 | dn->full_name); | 268 | dn->full_name); |
273 | return rc; | 269 | return rc; |
274 | } | 270 | } |
275 | 271 | ||
276 | of_attach_node(dn); | ||
277 | |||
278 | #ifdef CONFIG_PROC_DEVICETREE | ||
279 | ent = proc_mkdir(strrchr(dn->full_name, '/') + 1, dn->parent->pde); | ||
280 | if (ent) | ||
281 | proc_device_tree_add_node(dn, ent); | ||
282 | #endif | ||
283 | |||
284 | of_node_put(dn->parent); | 272 | of_node_put(dn->parent); |
285 | return 0; | 273 | return 0; |
286 | } | 274 | } |
287 | 275 | ||
288 | int dlpar_detach_node(struct device_node *dn) | 276 | int dlpar_detach_node(struct device_node *dn) |
289 | { | 277 | { |
290 | #ifdef CONFIG_PROC_DEVICETREE | 278 | int rc; |
291 | struct device_node *parent = dn->parent; | ||
292 | struct property *prop = dn->properties; | ||
293 | |||
294 | while (prop) { | ||
295 | remove_proc_entry(prop->name, dn->pde); | ||
296 | prop = prop->next; | ||
297 | } | ||
298 | 279 | ||
299 | if (dn->pde) | 280 | rc = of_detach_node(dn); |
300 | remove_proc_entry(dn->pde->name, parent->pde); | 281 | if (rc) |
301 | #endif | 282 | return rc; |
302 | 283 | ||
303 | pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn); | ||
304 | of_detach_node(dn); | ||
305 | of_node_put(dn); /* Must decrement the refcount */ | 284 | of_node_put(dn); /* Must decrement the refcount */ |
306 | |||
307 | return 0; | 285 | return 0; |
308 | } | 286 | } |
309 | 287 | ||
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 64c97d8ac0c5..a38956269fbf 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c | |||
@@ -23,12 +23,12 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/sched.h> /* for idle_task_exit */ | 24 | #include <linux/sched.h> /* for idle_task_exit */ |
25 | #include <linux/cpu.h> | 25 | #include <linux/cpu.h> |
26 | #include <linux/of.h> | ||
26 | #include <asm/prom.h> | 27 | #include <asm/prom.h> |
27 | #include <asm/rtas.h> | 28 | #include <asm/rtas.h> |
28 | #include <asm/firmware.h> | 29 | #include <asm/firmware.h> |
29 | #include <asm/machdep.h> | 30 | #include <asm/machdep.h> |
30 | #include <asm/vdso_datapage.h> | 31 | #include <asm/vdso_datapage.h> |
31 | #include <asm/pSeries_reconfig.h> | ||
32 | #include <asm/xics.h> | 32 | #include <asm/xics.h> |
33 | #include "plpar_wrappers.h" | 33 | #include "plpar_wrappers.h" |
34 | #include "offline_states.h" | 34 | #include "offline_states.h" |
@@ -333,10 +333,10 @@ static int pseries_smp_notifier(struct notifier_block *nb, | |||
333 | int err = 0; | 333 | int err = 0; |
334 | 334 | ||
335 | switch (action) { | 335 | switch (action) { |
336 | case PSERIES_RECONFIG_ADD: | 336 | case OF_RECONFIG_ATTACH_NODE: |
337 | err = pseries_add_processor(node); | 337 | err = pseries_add_processor(node); |
338 | break; | 338 | break; |
339 | case PSERIES_RECONFIG_REMOVE: | 339 | case OF_RECONFIG_DETACH_NODE: |
340 | pseries_remove_processor(node); | 340 | pseries_remove_processor(node); |
341 | break; | 341 | break; |
342 | } | 342 | } |
@@ -399,7 +399,7 @@ static int __init pseries_cpu_hotplug_init(void) | |||
399 | 399 | ||
400 | /* Processors can be added/removed only on LPAR */ | 400 | /* Processors can be added/removed only on LPAR */ |
401 | if (firmware_has_feature(FW_FEATURE_LPAR)) { | 401 | if (firmware_has_feature(FW_FEATURE_LPAR)) { |
402 | pSeries_reconfig_notifier_register(&pseries_smp_nb); | 402 | of_reconfig_notifier_register(&pseries_smp_nb); |
403 | cpu_maps_update_begin(); | 403 | cpu_maps_update_begin(); |
404 | if (cede_offline_enabled && parse_cede_parameters() == 0) { | 404 | if (cede_offline_enabled && parse_cede_parameters() == 0) { |
405 | default_offline_state = CPU_STATE_INACTIVE; | 405 | default_offline_state = CPU_STATE_INACTIVE; |
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index ecdb0a6b3171..2372c609fa2b 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <asm/firmware.h> | 17 | #include <asm/firmware.h> |
18 | #include <asm/machdep.h> | 18 | #include <asm/machdep.h> |
19 | #include <asm/pSeries_reconfig.h> | ||
20 | #include <asm/sparsemem.h> | 19 | #include <asm/sparsemem.h> |
21 | 20 | ||
22 | static unsigned long get_memblock_size(void) | 21 | static unsigned long get_memblock_size(void) |
@@ -187,42 +186,69 @@ static int pseries_add_memory(struct device_node *np) | |||
187 | return (ret < 0) ? -EINVAL : 0; | 186 | return (ret < 0) ? -EINVAL : 0; |
188 | } | 187 | } |
189 | 188 | ||
190 | static int pseries_drconf_memory(unsigned long *base, unsigned int action) | 189 | static int pseries_update_drconf_memory(struct of_prop_reconfig *pr) |
191 | { | 190 | { |
191 | struct of_drconf_cell *new_drmem, *old_drmem; | ||
192 | unsigned long memblock_size; | 192 | unsigned long memblock_size; |
193 | int rc; | 193 | u32 entries; |
194 | u32 *p; | ||
195 | int i, rc = -EINVAL; | ||
194 | 196 | ||
195 | memblock_size = get_memblock_size(); | 197 | memblock_size = get_memblock_size(); |
196 | if (!memblock_size) | 198 | if (!memblock_size) |
197 | return -EINVAL; | 199 | return -EINVAL; |
198 | 200 | ||
199 | if (action == PSERIES_DRCONF_MEM_ADD) { | 201 | p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL); |
200 | rc = memblock_add(*base, memblock_size); | 202 | if (!p) |
201 | rc = (rc < 0) ? -EINVAL : 0; | 203 | return -EINVAL; |
202 | } else if (action == PSERIES_DRCONF_MEM_REMOVE) { | 204 | |
203 | rc = pseries_remove_memblock(*base, memblock_size); | 205 | /* The first int of the property is the number of lmb's described |
204 | } else { | 206 | * by the property. This is followed by an array of of_drconf_cell |
205 | rc = -EINVAL; | 207 | * entries. Get the niumber of entries and skip to the array of |
208 | * of_drconf_cell's. | ||
209 | */ | ||
210 | entries = *p++; | ||
211 | old_drmem = (struct of_drconf_cell *)p; | ||
212 | |||
213 | p = (u32 *)pr->prop->value; | ||
214 | p++; | ||
215 | new_drmem = (struct of_drconf_cell *)p; | ||
216 | |||
217 | for (i = 0; i < entries; i++) { | ||
218 | if ((old_drmem[i].flags & DRCONF_MEM_ASSIGNED) && | ||
219 | (!(new_drmem[i].flags & DRCONF_MEM_ASSIGNED))) { | ||
220 | rc = pseries_remove_memblock(old_drmem[i].base_addr, | ||
221 | memblock_size); | ||
222 | break; | ||
223 | } else if ((!(old_drmem[i].flags & DRCONF_MEM_ASSIGNED)) && | ||
224 | (new_drmem[i].flags & DRCONF_MEM_ASSIGNED)) { | ||
225 | rc = memblock_add(old_drmem[i].base_addr, | ||
226 | memblock_size); | ||
227 | rc = (rc < 0) ? -EINVAL : 0; | ||
228 | break; | ||
229 | } | ||
206 | } | 230 | } |
207 | 231 | ||
208 | return rc; | 232 | return rc; |
209 | } | 233 | } |
210 | 234 | ||
211 | static int pseries_memory_notifier(struct notifier_block *nb, | 235 | static int pseries_memory_notifier(struct notifier_block *nb, |
212 | unsigned long action, void *node) | 236 | unsigned long action, void *node) |
213 | { | 237 | { |
238 | struct of_prop_reconfig *pr; | ||
214 | int err = 0; | 239 | int err = 0; |
215 | 240 | ||
216 | switch (action) { | 241 | switch (action) { |
217 | case PSERIES_RECONFIG_ADD: | 242 | case OF_RECONFIG_ATTACH_NODE: |
218 | err = pseries_add_memory(node); | 243 | err = pseries_add_memory(node); |
219 | break; | 244 | break; |
220 | case PSERIES_RECONFIG_REMOVE: | 245 | case OF_RECONFIG_DETACH_NODE: |
221 | err = pseries_remove_memory(node); | 246 | err = pseries_remove_memory(node); |
222 | break; | 247 | break; |
223 | case PSERIES_DRCONF_MEM_ADD: | 248 | case OF_RECONFIG_UPDATE_PROPERTY: |
224 | case PSERIES_DRCONF_MEM_REMOVE: | 249 | pr = (struct of_prop_reconfig *)node; |
225 | err = pseries_drconf_memory(node, action); | 250 | if (!strcmp(pr->prop->name, "ibm,dynamic-memory")) |
251 | err = pseries_update_drconf_memory(pr); | ||
226 | break; | 252 | break; |
227 | } | 253 | } |
228 | return notifier_from_errno(err); | 254 | return notifier_from_errno(err); |
@@ -235,7 +261,7 @@ static struct notifier_block pseries_mem_nb = { | |||
235 | static int __init pseries_memory_hotplug_init(void) | 261 | static int __init pseries_memory_hotplug_init(void) |
236 | { | 262 | { |
237 | if (firmware_has_feature(FW_FEATURE_LPAR)) | 263 | if (firmware_has_feature(FW_FEATURE_LPAR)) |
238 | pSeries_reconfig_notifier_register(&pseries_mem_nb); | 264 | of_reconfig_notifier_register(&pseries_mem_nb); |
239 | 265 | ||
240 | return 0; | 266 | return 0; |
241 | } | 267 | } |
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 6153eea27ce7..e2685badb5db 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -36,13 +36,13 @@ | |||
36 | #include <linux/dma-mapping.h> | 36 | #include <linux/dma-mapping.h> |
37 | #include <linux/crash_dump.h> | 37 | #include <linux/crash_dump.h> |
38 | #include <linux/memory.h> | 38 | #include <linux/memory.h> |
39 | #include <linux/of.h> | ||
39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
40 | #include <asm/prom.h> | 41 | #include <asm/prom.h> |
41 | #include <asm/rtas.h> | 42 | #include <asm/rtas.h> |
42 | #include <asm/iommu.h> | 43 | #include <asm/iommu.h> |
43 | #include <asm/pci-bridge.h> | 44 | #include <asm/pci-bridge.h> |
44 | #include <asm/machdep.h> | 45 | #include <asm/machdep.h> |
45 | #include <asm/pSeries_reconfig.h> | ||
46 | #include <asm/firmware.h> | 46 | #include <asm/firmware.h> |
47 | #include <asm/tce.h> | 47 | #include <asm/tce.h> |
48 | #include <asm/ppc-pci.h> | 48 | #include <asm/ppc-pci.h> |
@@ -760,7 +760,7 @@ static void remove_ddw(struct device_node *np) | |||
760 | __remove_ddw(np, ddw_avail, liobn); | 760 | __remove_ddw(np, ddw_avail, liobn); |
761 | 761 | ||
762 | delprop: | 762 | delprop: |
763 | ret = prom_remove_property(np, win64); | 763 | ret = of_remove_property(np, win64); |
764 | if (ret) | 764 | if (ret) |
765 | pr_warning("%s: failed to remove direct window property: %d\n", | 765 | pr_warning("%s: failed to remove direct window property: %d\n", |
766 | np->full_name, ret); | 766 | np->full_name, ret); |
@@ -1070,7 +1070,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn) | |||
1070 | goto out_free_window; | 1070 | goto out_free_window; |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | ret = prom_add_property(pdn, win64); | 1073 | ret = of_add_property(pdn, win64); |
1074 | if (ret) { | 1074 | if (ret) { |
1075 | dev_err(&dev->dev, "unable to add dma window property for %s: %d", | 1075 | dev_err(&dev->dev, "unable to add dma window property for %s: %d", |
1076 | pdn->full_name, ret); | 1076 | pdn->full_name, ret); |
@@ -1294,7 +1294,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti | |||
1294 | struct direct_window *window; | 1294 | struct direct_window *window; |
1295 | 1295 | ||
1296 | switch (action) { | 1296 | switch (action) { |
1297 | case PSERIES_RECONFIG_REMOVE: | 1297 | case OF_RECONFIG_DETACH_NODE: |
1298 | if (pci && pci->iommu_table) | 1298 | if (pci && pci->iommu_table) |
1299 | iommu_free_table(pci->iommu_table, np->full_name); | 1299 | iommu_free_table(pci->iommu_table, np->full_name); |
1300 | 1300 | ||
@@ -1357,7 +1357,7 @@ void iommu_init_early_pSeries(void) | |||
1357 | } | 1357 | } |
1358 | 1358 | ||
1359 | 1359 | ||
1360 | pSeries_reconfig_notifier_register(&iommu_reconfig_nb); | 1360 | of_reconfig_notifier_register(&iommu_reconfig_nb); |
1361 | register_memory_notifier(&iommu_mem_nb); | 1361 | register_memory_notifier(&iommu_mem_nb); |
1362 | 1362 | ||
1363 | set_pci_dma_ops(&dma_iommu_ops); | 1363 | set_pci_dma_ops(&dma_iommu_ops); |
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index dd30b12edfe4..6573808cc5f3 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c | |||
@@ -116,7 +116,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop, | |||
116 | } | 116 | } |
117 | 117 | ||
118 | if (!more) { | 118 | if (!more) { |
119 | prom_update_property(dn, new_prop); | 119 | of_update_property(dn, new_prop); |
120 | new_prop = NULL; | 120 | new_prop = NULL; |
121 | } | 121 | } |
122 | 122 | ||
@@ -172,7 +172,7 @@ static int update_dt_node(u32 phandle) | |||
172 | 172 | ||
173 | case 0x80000000: | 173 | case 0x80000000: |
174 | prop = of_find_property(dn, prop_name, NULL); | 174 | prop = of_find_property(dn, prop_name, NULL); |
175 | prom_remove_property(dn, prop); | 175 | of_remove_property(dn, prop); |
176 | prop = NULL; | 176 | prop = NULL; |
177 | break; | 177 | break; |
178 | 178 | ||
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 39f71fba9b38..30b358dc2beb 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c | |||
@@ -16,55 +16,13 @@ | |||
16 | #include <linux/notifier.h> | 16 | #include <linux/notifier.h> |
17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | ||
19 | 20 | ||
20 | #include <asm/prom.h> | 21 | #include <asm/prom.h> |
21 | #include <asm/machdep.h> | 22 | #include <asm/machdep.h> |
22 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
23 | #include <asm/pSeries_reconfig.h> | ||
24 | #include <asm/mmu.h> | 24 | #include <asm/mmu.h> |
25 | 25 | ||
26 | |||
27 | |||
28 | /* | ||
29 | * Routines for "runtime" addition and removal of device tree nodes. | ||
30 | */ | ||
31 | #ifdef CONFIG_PROC_DEVICETREE | ||
32 | /* | ||
33 | * Add a node to /proc/device-tree. | ||
34 | */ | ||
35 | static void add_node_proc_entries(struct device_node *np) | ||
36 | { | ||
37 | struct proc_dir_entry *ent; | ||
38 | |||
39 | ent = proc_mkdir(strrchr(np->full_name, '/') + 1, np->parent->pde); | ||
40 | if (ent) | ||
41 | proc_device_tree_add_node(np, ent); | ||
42 | } | ||
43 | |||
44 | static void remove_node_proc_entries(struct device_node *np) | ||
45 | { | ||
46 | struct property *pp = np->properties; | ||
47 | struct device_node *parent = np->parent; | ||
48 | |||
49 | while (pp) { | ||
50 | remove_proc_entry(pp->name, np->pde); | ||
51 | pp = pp->next; | ||
52 | } | ||
53 | if (np->pde) | ||
54 | remove_proc_entry(np->pde->name, parent->pde); | ||
55 | } | ||
56 | #else /* !CONFIG_PROC_DEVICETREE */ | ||
57 | static void add_node_proc_entries(struct device_node *np) | ||
58 | { | ||
59 | return; | ||
60 | } | ||
61 | |||
62 | static void remove_node_proc_entries(struct device_node *np) | ||
63 | { | ||
64 | return; | ||
65 | } | ||
66 | #endif /* CONFIG_PROC_DEVICETREE */ | ||
67 | |||
68 | /** | 26 | /** |
69 | * derive_parent - basically like dirname(1) | 27 | * derive_parent - basically like dirname(1) |
70 | * @path: the full_name of a node to be added to the tree | 28 | * @path: the full_name of a node to be added to the tree |
@@ -97,28 +55,6 @@ static struct device_node *derive_parent(const char *path) | |||
97 | return parent; | 55 | return parent; |
98 | } | 56 | } |
99 | 57 | ||
100 | static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain); | ||
101 | |||
102 | int pSeries_reconfig_notifier_register(struct notifier_block *nb) | ||
103 | { | ||
104 | return blocking_notifier_chain_register(&pSeries_reconfig_chain, nb); | ||
105 | } | ||
106 | EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_register); | ||
107 | |||
108 | void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) | ||
109 | { | ||
110 | blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb); | ||
111 | } | ||
112 | EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_unregister); | ||
113 | |||
114 | int pSeries_reconfig_notify(unsigned long action, void *p) | ||
115 | { | ||
116 | int err = blocking_notifier_call_chain(&pSeries_reconfig_chain, | ||
117 | action, p); | ||
118 | |||
119 | return notifier_to_errno(err); | ||
120 | } | ||
121 | |||
122 | static int pSeries_reconfig_add_node(const char *path, struct property *proplist) | 58 | static int pSeries_reconfig_add_node(const char *path, struct property *proplist) |
123 | { | 59 | { |
124 | struct device_node *np; | 60 | struct device_node *np; |
@@ -142,16 +78,12 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist | |||
142 | goto out_err; | 78 | goto out_err; |
143 | } | 79 | } |
144 | 80 | ||
145 | err = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, np); | 81 | err = of_attach_node(np); |
146 | if (err) { | 82 | if (err) { |
147 | printk(KERN_ERR "Failed to add device node %s\n", path); | 83 | printk(KERN_ERR "Failed to add device node %s\n", path); |
148 | goto out_err; | 84 | goto out_err; |
149 | } | 85 | } |
150 | 86 | ||
151 | of_attach_node(np); | ||
152 | |||
153 | add_node_proc_entries(np); | ||
154 | |||
155 | of_node_put(np->parent); | 87 | of_node_put(np->parent); |
156 | 88 | ||
157 | return 0; | 89 | return 0; |
@@ -179,11 +111,7 @@ static int pSeries_reconfig_remove_node(struct device_node *np) | |||
179 | return -EBUSY; | 111 | return -EBUSY; |
180 | } | 112 | } |
181 | 113 | ||
182 | remove_node_proc_entries(np); | ||
183 | |||
184 | pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, np); | ||
185 | of_detach_node(np); | 114 | of_detach_node(np); |
186 | |||
187 | of_node_put(parent); | 115 | of_node_put(parent); |
188 | of_node_put(np); /* Must decrement the refcount */ | 116 | of_node_put(np); /* Must decrement the refcount */ |
189 | return 0; | 117 | return 0; |
@@ -398,7 +326,7 @@ static int do_add_property(char *buf, size_t bufsize) | |||
398 | if (!prop) | 326 | if (!prop) |
399 | return -ENOMEM; | 327 | return -ENOMEM; |
400 | 328 | ||
401 | prom_add_property(np, prop); | 329 | of_add_property(np, prop); |
402 | 330 | ||
403 | return 0; | 331 | return 0; |
404 | } | 332 | } |
@@ -422,16 +350,15 @@ static int do_remove_property(char *buf, size_t bufsize) | |||
422 | 350 | ||
423 | prop = of_find_property(np, buf, NULL); | 351 | prop = of_find_property(np, buf, NULL); |
424 | 352 | ||
425 | return prom_remove_property(np, prop); | 353 | return of_remove_property(np, prop); |
426 | } | 354 | } |
427 | 355 | ||
428 | static int do_update_property(char *buf, size_t bufsize) | 356 | static int do_update_property(char *buf, size_t bufsize) |
429 | { | 357 | { |
430 | struct device_node *np; | 358 | struct device_node *np; |
431 | struct pSeries_reconfig_prop_update upd_value; | ||
432 | unsigned char *value; | 359 | unsigned char *value; |
433 | char *name, *end, *next_prop; | 360 | char *name, *end, *next_prop; |
434 | int rc, length; | 361 | int length; |
435 | struct property *newprop; | 362 | struct property *newprop; |
436 | buf = parse_node(buf, bufsize, &np); | 363 | buf = parse_node(buf, bufsize, &np); |
437 | end = buf + bufsize; | 364 | end = buf + bufsize; |
@@ -453,41 +380,7 @@ static int do_update_property(char *buf, size_t bufsize) | |||
453 | if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size")) | 380 | if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size")) |
454 | slb_set_size(*(int *)value); | 381 | slb_set_size(*(int *)value); |
455 | 382 | ||
456 | upd_value.node = np; | 383 | return of_update_property(np, newprop); |
457 | upd_value.property = newprop; | ||
458 | pSeries_reconfig_notify(PSERIES_UPDATE_PROPERTY, &upd_value); | ||
459 | |||
460 | rc = prom_update_property(np, newprop); | ||
461 | if (rc) | ||
462 | return rc; | ||
463 | |||
464 | /* For memory under the ibm,dynamic-reconfiguration-memory node | ||
465 | * of the device tree, adding and removing memory is just an update | ||
466 | * to the ibm,dynamic-memory property instead of adding/removing a | ||
467 | * memory node in the device tree. For these cases we still need to | ||
468 | * involve the notifier chain. | ||
469 | */ | ||
470 | if (!strcmp(name, "ibm,dynamic-memory")) { | ||
471 | int action; | ||
472 | |||
473 | next_prop = parse_next_property(next_prop, end, &name, | ||
474 | &length, &value); | ||
475 | if (!next_prop) | ||
476 | return -EINVAL; | ||
477 | |||
478 | if (!strcmp(name, "add")) | ||
479 | action = PSERIES_DRCONF_MEM_ADD; | ||
480 | else | ||
481 | action = PSERIES_DRCONF_MEM_REMOVE; | ||
482 | |||
483 | rc = pSeries_reconfig_notify(action, value); | ||
484 | if (rc) { | ||
485 | prom_update_property(np, newprop); | ||
486 | return rc; | ||
487 | } | ||
488 | } | ||
489 | |||
490 | return 0; | ||
491 | } | 384 | } |
492 | 385 | ||
493 | /** | 386 | /** |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index e3cb7ae61658..e1a5b8a32d25 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <linux/seq_file.h> | 40 | #include <linux/seq_file.h> |
41 | #include <linux/root_dev.h> | 41 | #include <linux/root_dev.h> |
42 | #include <linux/cpuidle.h> | 42 | #include <linux/cpuidle.h> |
43 | #include <linux/of.h> | ||
43 | 44 | ||
44 | #include <asm/mmu.h> | 45 | #include <asm/mmu.h> |
45 | #include <asm/processor.h> | 46 | #include <asm/processor.h> |
@@ -63,7 +64,6 @@ | |||
63 | #include <asm/smp.h> | 64 | #include <asm/smp.h> |
64 | #include <asm/firmware.h> | 65 | #include <asm/firmware.h> |
65 | #include <asm/eeh.h> | 66 | #include <asm/eeh.h> |
66 | #include <asm/pSeries_reconfig.h> | ||
67 | 67 | ||
68 | #include "plpar_wrappers.h" | 68 | #include "plpar_wrappers.h" |
69 | #include "pseries.h" | 69 | #include "pseries.h" |
@@ -258,7 +258,7 @@ static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long act | |||
258 | int err = NOTIFY_OK; | 258 | int err = NOTIFY_OK; |
259 | 259 | ||
260 | switch (action) { | 260 | switch (action) { |
261 | case PSERIES_RECONFIG_ADD: | 261 | case OF_RECONFIG_ATTACH_NODE: |
262 | pci = np->parent->data; | 262 | pci = np->parent->data; |
263 | if (pci) { | 263 | if (pci) { |
264 | update_dn_pci_info(np, pci->phb); | 264 | update_dn_pci_info(np, pci->phb); |
@@ -389,7 +389,7 @@ static void __init pSeries_setup_arch(void) | |||
389 | /* Find and initialize PCI host bridges */ | 389 | /* Find and initialize PCI host bridges */ |
390 | init_pci_config_tokens(); | 390 | init_pci_config_tokens(); |
391 | find_and_init_phbs(); | 391 | find_and_init_phbs(); |
392 | pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb); | 392 | of_reconfig_notifier_register(&pci_dn_reconfig_nb); |
393 | 393 | ||
394 | pSeries_nvram_init(); | 394 | pSeries_nvram_init(); |
395 | 395 | ||
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 71706bc34a0d..9fc0a4941908 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <asm/cputable.h> | 38 | #include <asm/cputable.h> |
39 | #include <asm/firmware.h> | 39 | #include <asm/firmware.h> |
40 | #include <asm/rtas.h> | 40 | #include <asm/rtas.h> |
41 | #include <asm/pSeries_reconfig.h> | ||
42 | #include <asm/mpic.h> | 41 | #include <asm/mpic.h> |
43 | #include <asm/vdso_datapage.h> | 42 | #include <asm/vdso_datapage.h> |
44 | #include <asm/cputhreads.h> | 43 | #include <asm/cputhreads.h> |