2 * pseries Memory Hotplug infrastructure.
4 * Copyright (C) 2008 Badari Pulavarty, IBM Corporation
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version
9 * 2 of the License, or (at your option) any later version.
12 #define pr_fmt(fmt) "pseries-hotplug-mem: " fmt
15 #include <linux/of_address.h>
16 #include <linux/memblock.h>
17 #include <linux/memory.h>
18 #include <linux/memory_hotplug.h>
19 #include <linux/slab.h>
21 #include <asm/firmware.h>
22 #include <asm/machdep.h>
24 #include <asm/sparsemem.h>
27 static bool rtas_hp_event;
29 unsigned long pseries_memory_block_size(void)
31 struct device_node *np;
32 unsigned int memblock_size = MIN_MEMORY_BLOCK_SIZE;
35 np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
39 size = of_get_property(np, "ibm,lmb-size", NULL);
41 memblock_size = be64_to_cpup(size);
43 } else if (machine_is(pseries)) {
44 /* This fallback really only applies to pseries */
45 unsigned int memzero_size = 0;
47 np = of_find_node_by_path("/memory@0");
49 if (!of_address_to_resource(np, 0, &r))
50 memzero_size = resource_size(&r);
55 /* We now know the size of memory@0, use this to find
56 * the first memoryblock and get its size.
60 sprintf(buf, "/memory@%x", memzero_size);
61 np = of_find_node_by_path(buf);
63 if (!of_address_to_resource(np, 0, &r))
64 memblock_size = resource_size(&r);
72 static void dlpar_free_property(struct property *prop)
79 static struct property *dlpar_clone_property(struct property *prop,
82 struct property *new_prop;
84 new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
88 new_prop->name = kstrdup(prop->name, GFP_KERNEL);
89 new_prop->value = kzalloc(prop_size, GFP_KERNEL);
90 if (!new_prop->name || !new_prop->value) {
91 dlpar_free_property(new_prop);
95 memcpy(new_prop->value, prop->value, prop->length);
96 new_prop->length = prop_size;
98 of_property_set_flag(new_prop, OF_DYNAMIC);
102 static struct property *dlpar_clone_drconf_property(struct device_node *dn)
104 struct property *prop, *new_prop;
105 struct of_drconf_cell *lmbs;
109 prop = of_find_property(dn, "ibm,dynamic-memory", NULL);
113 new_prop = dlpar_clone_property(prop, prop->length);
117 /* Convert the property to cpu endian-ness */
119 *p = be32_to_cpu(*p);
122 lmbs = (struct of_drconf_cell *)p;
124 for (i = 0; i < num_lmbs; i++) {
125 lmbs[i].base_addr = be64_to_cpu(lmbs[i].base_addr);
126 lmbs[i].drc_index = be32_to_cpu(lmbs[i].drc_index);
127 lmbs[i].flags = be32_to_cpu(lmbs[i].flags);
133 static void dlpar_update_drconf_property(struct device_node *dn,
134 struct property *prop)
136 struct of_drconf_cell *lmbs;
140 /* Convert the property back to BE */
143 *p = cpu_to_be32(*p);
146 lmbs = (struct of_drconf_cell *)p;
147 for (i = 0; i < num_lmbs; i++) {
148 lmbs[i].base_addr = cpu_to_be64(lmbs[i].base_addr);
149 lmbs[i].drc_index = cpu_to_be32(lmbs[i].drc_index);
150 lmbs[i].flags = cpu_to_be32(lmbs[i].flags);
153 rtas_hp_event = true;
154 of_update_property(dn, prop);
155 rtas_hp_event = false;
158 static int dlpar_update_device_tree_lmb(struct of_drconf_cell *lmb)
160 struct device_node *dn;
161 struct property *prop;
162 struct of_drconf_cell *lmbs;
166 dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
170 prop = dlpar_clone_drconf_property(dn);
178 lmbs = (struct of_drconf_cell *)p;
180 for (i = 0; i < num_lmbs; i++) {
181 if (lmbs[i].drc_index == lmb->drc_index) {
182 lmbs[i].flags = lmb->flags;
183 lmbs[i].aa_index = lmb->aa_index;
185 dlpar_update_drconf_property(dn, prop);
194 static u32 find_aa_index(struct device_node *dr_node,
195 struct property *ala_prop, const u32 *lmb_assoc)
199 int aa_arrays, aa_array_entries, aa_array_sz;
203 * The ibm,associativity-lookup-arrays property is defined to be
204 * a 32-bit value specifying the number of associativity arrays
205 * followed by a 32-bitvalue specifying the number of entries per
206 * array, followed by the associativity arrays.
208 assoc_arrays = ala_prop->value;
210 aa_arrays = be32_to_cpu(assoc_arrays[0]);
211 aa_array_entries = be32_to_cpu(assoc_arrays[1]);
212 aa_array_sz = aa_array_entries * sizeof(u32);
215 for (i = 0; i < aa_arrays; i++) {
216 index = (i * aa_array_entries) + 2;
218 if (memcmp(&assoc_arrays[index], &lmb_assoc[1], aa_array_sz))
225 if (aa_index == -1) {
226 struct property *new_prop;
229 new_prop_size = ala_prop->length + aa_array_sz;
230 new_prop = dlpar_clone_property(ala_prop, new_prop_size);
234 assoc_arrays = new_prop->value;
236 /* increment the number of entries in the lookup array */
237 assoc_arrays[0] = cpu_to_be32(aa_arrays + 1);
239 /* copy the new associativity into the lookup array */
240 index = aa_arrays * aa_array_entries + 2;
241 memcpy(&assoc_arrays[index], &lmb_assoc[1], aa_array_sz);
243 of_update_property(dr_node, new_prop);
246 * The associativity lookup array index for this lmb is
247 * number of entries - 1 since we added its associativity
248 * to the end of the lookup array.
250 aa_index = be32_to_cpu(assoc_arrays[0]) - 1;
256 static u32 lookup_lmb_associativity_index(struct of_drconf_cell *lmb)
258 struct device_node *parent, *lmb_node, *dr_node;
259 struct property *ala_prop;
260 const u32 *lmb_assoc;
263 parent = of_find_node_by_path("/");
267 lmb_node = dlpar_configure_connector(cpu_to_be32(lmb->drc_index),
273 lmb_assoc = of_get_property(lmb_node, "ibm,associativity", NULL);
275 dlpar_free_cc_nodes(lmb_node);
279 dr_node = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
281 dlpar_free_cc_nodes(lmb_node);
285 ala_prop = of_find_property(dr_node, "ibm,associativity-lookup-arrays",
288 of_node_put(dr_node);
289 dlpar_free_cc_nodes(lmb_node);
293 aa_index = find_aa_index(dr_node, ala_prop, lmb_assoc);
295 dlpar_free_cc_nodes(lmb_node);
299 static int dlpar_add_device_tree_lmb(struct of_drconf_cell *lmb)
303 lmb->flags |= DRCONF_MEM_ASSIGNED;
305 aa_index = lookup_lmb_associativity_index(lmb);
307 pr_err("Couldn't find associativity index for drc index %x\n",
312 lmb->aa_index = aa_index;
313 return dlpar_update_device_tree_lmb(lmb);
316 static int dlpar_remove_device_tree_lmb(struct of_drconf_cell *lmb)
318 lmb->flags &= ~DRCONF_MEM_ASSIGNED;
319 lmb->aa_index = 0xffffffff;
320 return dlpar_update_device_tree_lmb(lmb);
323 static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)
325 unsigned long section_nr;
326 struct mem_section *mem_sect;
327 struct memory_block *mem_block;
329 section_nr = pfn_to_section_nr(PFN_DOWN(lmb->base_addr));
330 mem_sect = __nr_to_section(section_nr);
332 mem_block = find_memory_block(mem_sect);
336 #ifdef CONFIG_MEMORY_HOTREMOVE
337 static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
339 unsigned long block_sz, start_pfn;
340 int sections_per_block;
343 start_pfn = base >> PAGE_SHIFT;
345 lock_device_hotplug();
347 if (!pfn_valid(start_pfn))
350 block_sz = pseries_memory_block_size();
351 sections_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE;
352 nid = memory_add_physaddr_to_nid(base);
354 for (i = 0; i < sections_per_block; i++) {
355 remove_memory(nid, base, MIN_MEMORY_BLOCK_SIZE);
356 base += MIN_MEMORY_BLOCK_SIZE;
360 /* Update memory regions for memory remove */
361 memblock_remove(base, memblock_size);
362 unlock_device_hotplug();
366 static int pseries_remove_mem_node(struct device_node *np)
371 unsigned int lmb_size;
375 * Check to see if we are actually removing memory
377 type = of_get_property(np, "device_type", NULL);
378 if (type == NULL || strcmp(type, "memory") != 0)
382 * Find the base address and size of the memblock
384 regs = of_get_property(np, "reg", NULL);
388 base = be64_to_cpu(*(unsigned long *)regs);
389 lmb_size = be32_to_cpu(regs[3]);
391 pseries_remove_memblock(base, lmb_size);
395 static bool lmb_is_removable(struct of_drconf_cell *lmb)
397 int i, scns_per_block;
399 unsigned long pfn, block_sz;
402 if (!(lmb->flags & DRCONF_MEM_ASSIGNED))
405 block_sz = memory_block_size_bytes();
406 scns_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE;
407 phys_addr = lmb->base_addr;
409 for (i = 0; i < scns_per_block; i++) {
410 pfn = PFN_DOWN(phys_addr);
411 if (!pfn_present(pfn))
414 rc &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
415 phys_addr += MIN_MEMORY_BLOCK_SIZE;
418 return rc ? true : false;
421 static int dlpar_add_lmb(struct of_drconf_cell *);
423 static int dlpar_remove_lmb(struct of_drconf_cell *lmb)
425 struct memory_block *mem_block;
426 unsigned long block_sz;
429 if (!lmb_is_removable(lmb))
432 mem_block = lmb_to_memblock(lmb);
436 rc = device_offline(&mem_block->dev);
437 put_device(&mem_block->dev);
441 block_sz = pseries_memory_block_size();
442 nid = memory_add_physaddr_to_nid(lmb->base_addr);
444 remove_memory(nid, lmb->base_addr, block_sz);
446 /* Update memory regions for memory remove */
447 memblock_remove(lmb->base_addr, block_sz);
449 dlpar_remove_device_tree_lmb(lmb);
453 static int dlpar_memory_remove_by_count(u32 lmbs_to_remove,
454 struct property *prop)
456 struct of_drconf_cell *lmbs;
457 int lmbs_removed = 0;
458 int lmbs_available = 0;
462 pr_info("Attempting to hot-remove %d LMB(s)\n", lmbs_to_remove);
464 if (lmbs_to_remove == 0)
469 lmbs = (struct of_drconf_cell *)p;
471 /* Validate that there are enough LMBs to satisfy the request */
472 for (i = 0; i < num_lmbs; i++) {
473 if (lmb_is_removable(&lmbs[i]))
477 if (lmbs_available < lmbs_to_remove) {
478 pr_info("Not enough LMBs available (%d of %d) to satisfy request\n",
479 lmbs_available, lmbs_to_remove);
483 for (i = 0; i < num_lmbs && lmbs_removed < lmbs_to_remove; i++) {
484 rc = dlpar_remove_lmb(&lmbs[i]);
490 /* Mark this lmb so we can add it later if all of the
491 * requested LMBs cannot be removed.
493 lmbs[i].reserved = 1;
496 if (lmbs_removed != lmbs_to_remove) {
497 pr_err("Memory hot-remove failed, adding LMB's back\n");
499 for (i = 0; i < num_lmbs; i++) {
500 if (!lmbs[i].reserved)
503 rc = dlpar_add_lmb(&lmbs[i]);
505 pr_err("Failed to add LMB back, drc index %x\n",
508 lmbs[i].reserved = 0;
513 for (i = 0; i < num_lmbs; i++) {
514 if (!lmbs[i].reserved)
517 dlpar_release_drc(lmbs[i].drc_index);
518 pr_info("Memory at %llx was hot-removed\n",
521 lmbs[i].reserved = 0;
529 static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)
531 struct of_drconf_cell *lmbs;
536 pr_info("Attempting to hot-remove LMB, drc index %x\n", drc_index);
540 lmbs = (struct of_drconf_cell *)p;
543 for (i = 0; i < num_lmbs; i++) {
544 if (lmbs[i].drc_index == drc_index) {
546 rc = dlpar_remove_lmb(&lmbs[i]);
548 dlpar_release_drc(lmbs[i].drc_index);
558 pr_info("Failed to hot-remove memory at %llx\n",
561 pr_info("Memory at %llx was hot-removed\n", lmbs[i].base_addr);
566 static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)
568 struct of_drconf_cell *lmbs;
573 pr_info("Attempting to update LMB, drc index %x\n", drc_index);
577 lmbs = (struct of_drconf_cell *)p;
580 for (i = 0; i < num_lmbs; i++) {
581 if (lmbs[i].drc_index == drc_index) {
583 rc = dlpar_remove_lmb(&lmbs[i]);
585 rc = dlpar_add_lmb(&lmbs[i]);
587 dlpar_release_drc(lmbs[i].drc_index);
597 pr_info("Failed to update memory at %llx\n",
600 pr_info("Memory at %llx was updated\n", lmbs[i].base_addr);
605 static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
606 struct property *prop)
608 struct of_drconf_cell *lmbs;
610 int i, rc, start_lmb_found;
611 int lmbs_available = 0, start_index = 0, end_index;
613 pr_info("Attempting to hot-remove %u LMB(s) at %x\n",
614 lmbs_to_remove, drc_index);
616 if (lmbs_to_remove == 0)
621 lmbs = (struct of_drconf_cell *)p;
624 /* Navigate to drc_index */
625 while (start_index < num_lmbs) {
626 if (lmbs[start_index].drc_index == drc_index) {
634 if (!start_lmb_found)
637 end_index = start_index + lmbs_to_remove;
639 /* Validate that there are enough LMBs to satisfy the request */
640 for (i = start_index; i < end_index; i++) {
641 if (lmbs[i].flags & DRCONF_MEM_RESERVED)
647 if (lmbs_available < lmbs_to_remove)
650 for (i = start_index; i < end_index; i++) {
651 if (!(lmbs[i].flags & DRCONF_MEM_ASSIGNED))
654 rc = dlpar_remove_lmb(&lmbs[i]);
658 lmbs[i].reserved = 1;
662 pr_err("Memory indexed-count-remove failed, adding any removed LMBs\n");
664 for (i = start_index; i < end_index; i++) {
665 if (!lmbs[i].reserved)
668 rc = dlpar_add_lmb(&lmbs[i]);
670 pr_err("Failed to add LMB, drc index %x\n",
671 be32_to_cpu(lmbs[i].drc_index));
673 lmbs[i].reserved = 0;
677 for (i = start_index; i < end_index; i++) {
678 if (!lmbs[i].reserved)
681 dlpar_release_drc(lmbs[i].drc_index);
682 pr_info("Memory at %llx (drc index %x) was hot-removed\n",
683 lmbs[i].base_addr, lmbs[i].drc_index);
685 lmbs[i].reserved = 0;
693 static inline int pseries_remove_memblock(unsigned long base,
694 unsigned int memblock_size)
698 static inline int pseries_remove_mem_node(struct device_node *np)
702 static inline int dlpar_memory_remove(struct pseries_hp_errorlog *hp_elog)
706 static int dlpar_remove_lmb(struct of_drconf_cell *lmb)
710 static int dlpar_memory_remove_by_count(u32 lmbs_to_remove,
711 struct property *prop)
715 static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)
719 static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)
724 static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
725 struct property *prop)
729 #endif /* CONFIG_MEMORY_HOTREMOVE */
731 static int dlpar_online_lmb(struct of_drconf_cell *lmb)
733 struct memory_block *mem_block;
736 mem_block = lmb_to_memblock(lmb);
740 rc = device_online(&mem_block->dev);
741 put_device(&mem_block->dev);
745 static int dlpar_add_lmb(struct of_drconf_cell *lmb)
747 unsigned long block_sz;
750 if (lmb->flags & DRCONF_MEM_ASSIGNED)
753 rc = dlpar_add_device_tree_lmb(lmb);
755 pr_err("Couldn't update device tree for drc index %x\n",
757 dlpar_release_drc(lmb->drc_index);
761 block_sz = memory_block_size_bytes();
763 /* Find the node id for this address */
764 nid = memory_add_physaddr_to_nid(lmb->base_addr);
767 rc = add_memory(nid, lmb->base_addr, block_sz);
769 dlpar_remove_device_tree_lmb(lmb);
773 rc = dlpar_online_lmb(lmb);
775 remove_memory(nid, lmb->base_addr, block_sz);
776 dlpar_remove_device_tree_lmb(lmb);
778 lmb->flags |= DRCONF_MEM_ASSIGNED;
784 static int dlpar_memory_add_by_count(u32 lmbs_to_add, struct property *prop)
786 struct of_drconf_cell *lmbs;
788 int lmbs_available = 0;
792 pr_info("Attempting to hot-add %d LMB(s)\n", lmbs_to_add);
794 if (lmbs_to_add == 0)
799 lmbs = (struct of_drconf_cell *)p;
801 /* Validate that there are enough LMBs to satisfy the request */
802 for (i = 0; i < num_lmbs; i++) {
803 if (!(lmbs[i].flags & DRCONF_MEM_ASSIGNED))
807 if (lmbs_available < lmbs_to_add)
810 for (i = 0; i < num_lmbs && lmbs_to_add != lmbs_added; i++) {
811 rc = dlpar_acquire_drc(lmbs[i].drc_index);
815 rc = dlpar_add_lmb(&lmbs[i]);
817 dlpar_release_drc(lmbs[i].drc_index);
823 /* Mark this lmb so we can remove it later if all of the
824 * requested LMBs cannot be added.
826 lmbs[i].reserved = 1;
829 if (lmbs_added != lmbs_to_add) {
830 pr_err("Memory hot-add failed, removing any added LMBs\n");
832 for (i = 0; i < num_lmbs; i++) {
833 if (!lmbs[i].reserved)
836 rc = dlpar_remove_lmb(&lmbs[i]);
838 pr_err("Failed to remove LMB, drc index %x\n",
839 be32_to_cpu(lmbs[i].drc_index));
841 dlpar_release_drc(lmbs[i].drc_index);
845 for (i = 0; i < num_lmbs; i++) {
846 if (!lmbs[i].reserved)
849 pr_info("Memory at %llx (drc index %x) was hot-added\n",
850 lmbs[i].base_addr, lmbs[i].drc_index);
851 lmbs[i].reserved = 0;
858 static int dlpar_memory_add_by_index(u32 drc_index, struct property *prop)
860 struct of_drconf_cell *lmbs;
865 pr_info("Attempting to hot-add LMB, drc index %x\n", drc_index);
869 lmbs = (struct of_drconf_cell *)p;
872 for (i = 0; i < num_lmbs; i++) {
873 if (lmbs[i].drc_index == drc_index) {
875 rc = dlpar_acquire_drc(lmbs[i].drc_index);
877 rc = dlpar_add_lmb(&lmbs[i]);
879 dlpar_release_drc(lmbs[i].drc_index);
890 pr_info("Failed to hot-add memory, drc index %x\n", drc_index);
892 pr_info("Memory at %llx (drc index %x) was hot-added\n",
893 lmbs[i].base_addr, drc_index);
898 static int dlpar_memory_add_by_ic(u32 lmbs_to_add, u32 drc_index,
899 struct property *prop)
901 struct of_drconf_cell *lmbs;
903 int i, rc, start_lmb_found;
904 int lmbs_available = 0, start_index = 0, end_index;
906 pr_info("Attempting to hot-add %u LMB(s) at index %x\n",
907 lmbs_to_add, drc_index);
909 if (lmbs_to_add == 0)
914 lmbs = (struct of_drconf_cell *)p;
917 /* Navigate to drc_index */
918 while (start_index < num_lmbs) {
919 if (lmbs[start_index].drc_index == drc_index) {
927 if (!start_lmb_found)
930 end_index = start_index + lmbs_to_add;
932 /* Validate that the LMBs in this range are not reserved */
933 for (i = start_index; i < end_index; i++) {
934 if (lmbs[i].flags & DRCONF_MEM_RESERVED)
940 if (lmbs_available < lmbs_to_add)
943 for (i = start_index; i < end_index; i++) {
944 if (lmbs[i].flags & DRCONF_MEM_ASSIGNED)
947 rc = dlpar_acquire_drc(lmbs[i].drc_index);
951 rc = dlpar_add_lmb(&lmbs[i]);
953 dlpar_release_drc(lmbs[i].drc_index);
957 lmbs[i].reserved = 1;
961 pr_err("Memory indexed-count-add failed, removing any added LMBs\n");
963 for (i = start_index; i < end_index; i++) {
964 if (!lmbs[i].reserved)
967 rc = dlpar_remove_lmb(&lmbs[i]);
969 pr_err("Failed to remove LMB, drc index %x\n",
970 be32_to_cpu(lmbs[i].drc_index));
972 dlpar_release_drc(lmbs[i].drc_index);
976 for (i = start_index; i < end_index; i++) {
977 if (!lmbs[i].reserved)
980 pr_info("Memory at %llx (drc index %x) was hot-added\n",
981 lmbs[i].base_addr, lmbs[i].drc_index);
982 lmbs[i].reserved = 0;
989 int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
991 struct device_node *dn;
992 struct property *prop;
993 u32 count, drc_index;
996 lock_device_hotplug();
998 dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
1001 goto dlpar_memory_out;
1004 prop = dlpar_clone_drconf_property(dn);
1007 goto dlpar_memory_out;
1010 switch (hp_elog->action) {
1011 case PSERIES_HP_ELOG_ACTION_ADD:
1012 if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
1013 count = hp_elog->_drc_u.drc_count;
1014 rc = dlpar_memory_add_by_count(count, prop);
1015 } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
1016 drc_index = hp_elog->_drc_u.drc_index;
1017 rc = dlpar_memory_add_by_index(drc_index, prop);
1018 } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
1019 count = hp_elog->_drc_u.ic.count;
1020 drc_index = hp_elog->_drc_u.ic.index;
1021 rc = dlpar_memory_add_by_ic(count, drc_index, prop);
1027 case PSERIES_HP_ELOG_ACTION_REMOVE:
1028 if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
1029 count = hp_elog->_drc_u.drc_count;
1030 rc = dlpar_memory_remove_by_count(count, prop);
1031 } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
1032 drc_index = hp_elog->_drc_u.drc_index;
1033 rc = dlpar_memory_remove_by_index(drc_index, prop);
1034 } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
1035 count = hp_elog->_drc_u.ic.count;
1036 drc_index = hp_elog->_drc_u.ic.index;
1037 rc = dlpar_memory_remove_by_ic(count, drc_index, prop);
1043 case PSERIES_HP_ELOG_ACTION_READD:
1044 drc_index = hp_elog->_drc_u.drc_index;
1045 rc = dlpar_memory_readd_by_index(drc_index, prop);
1048 pr_err("Invalid action (%d) specified\n", hp_elog->action);
1053 dlpar_free_property(prop);
1057 unlock_device_hotplug();
1061 static int pseries_add_mem_node(struct device_node *np)
1066 unsigned int lmb_size;
1070 * Check to see if we are actually adding memory
1072 type = of_get_property(np, "device_type", NULL);
1073 if (type == NULL || strcmp(type, "memory") != 0)
1077 * Find the base and size of the memblock
1079 regs = of_get_property(np, "reg", NULL);
1083 base = be64_to_cpu(*(unsigned long *)regs);
1084 lmb_size = be32_to_cpu(regs[3]);
1087 * Update memory region to represent the memory add
1089 ret = memblock_add(base, lmb_size);
1090 return (ret < 0) ? -EINVAL : 0;
1093 static int pseries_update_drconf_memory(struct of_reconfig_data *pr)
1095 struct of_drconf_cell *new_drmem, *old_drmem;
1096 unsigned long memblock_size;
1099 int i, rc = -EINVAL;
1104 memblock_size = pseries_memory_block_size();
1108 p = (__be32 *) pr->old_prop->value;
1112 /* The first int of the property is the number of lmb's described
1113 * by the property. This is followed by an array of of_drconf_cell
1114 * entries. Get the number of entries and skip to the array of
1117 entries = be32_to_cpu(*p++);
1118 old_drmem = (struct of_drconf_cell *)p;
1120 p = (__be32 *)pr->prop->value;
1122 new_drmem = (struct of_drconf_cell *)p;
1124 for (i = 0; i < entries; i++) {
1125 if ((be32_to_cpu(old_drmem[i].flags) & DRCONF_MEM_ASSIGNED) &&
1126 (!(be32_to_cpu(new_drmem[i].flags) & DRCONF_MEM_ASSIGNED))) {
1127 rc = pseries_remove_memblock(
1128 be64_to_cpu(old_drmem[i].base_addr),
1131 } else if ((!(be32_to_cpu(old_drmem[i].flags) &
1132 DRCONF_MEM_ASSIGNED)) &&
1133 (be32_to_cpu(new_drmem[i].flags) &
1134 DRCONF_MEM_ASSIGNED)) {
1135 rc = memblock_add(be64_to_cpu(old_drmem[i].base_addr),
1137 rc = (rc < 0) ? -EINVAL : 0;
1144 static int pseries_memory_notifier(struct notifier_block *nb,
1145 unsigned long action, void *data)
1147 struct of_reconfig_data *rd = data;
1151 case OF_RECONFIG_ATTACH_NODE:
1152 err = pseries_add_mem_node(rd->dn);
1154 case OF_RECONFIG_DETACH_NODE:
1155 err = pseries_remove_mem_node(rd->dn);
1157 case OF_RECONFIG_UPDATE_PROPERTY:
1158 if (!strcmp(rd->prop->name, "ibm,dynamic-memory"))
1159 err = pseries_update_drconf_memory(rd);
1162 return notifier_from_errno(err);
1165 static struct notifier_block pseries_mem_nb = {
1166 .notifier_call = pseries_memory_notifier,
1169 static int __init pseries_memory_hotplug_init(void)
1171 if (firmware_has_feature(FW_FEATURE_LPAR))
1172 of_reconfig_notifier_register(&pseries_mem_nb);
1176 machine_device_initcall(pseries, pseries_memory_hotplug_init);