1 files changed, 43 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 2d3e9a4bd6ae..3c5727dd5aa5 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/of.h>
+#include <linux/lmb.h>
 #include <asm/firmware.h>
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
@@ -58,6 +59,11 @@ static int pseries_remove_memory(struct device_node *np)
                 return ret;
 
         /*
+         * Update memory regions for memory remove
+         */
+        lmb_remove(start_pfn << PAGE_SHIFT, regs[3]);
+
+        /*
          * Remove htab bolted mappings for this section of memory
          */
         start = (unsigned long)__va(start_pfn << PAGE_SHIFT);
@@ -65,6 +71,41 @@ static int pseries_remove_memory(struct device_node *np)
         return ret;
 }
 
+static int pseries_add_memory(struct device_node *np)
+{
+        const char *type;
+        const unsigned int *my_index;
+        const unsigned int *regs;
+        u64 start_pfn;
+        int ret = -EINVAL;
+
+        /*
+         * Check to see if we are actually adding memory
+         */
+        type = of_get_property(np, "device_type", NULL);
+        if (type == NULL || strcmp(type, "memory") != 0)
+                return 0;
+
+        /*
+         * Find the memory index and size of the added section
+         */
+        my_index = of_get_property(np, "ibm,my-drc-index", NULL);
+        if (!my_index)
+                return ret;
+
+        regs = of_get_property(np, "reg", NULL);
+        if (!regs)
+                return ret;
+
+        start_pfn = section_nr_to_pfn(*my_index & 0xffff);
+
+        /*
+         * Update memory region to represent the memory add
+         */
+        lmb_add(start_pfn << PAGE_SHIFT, regs[3]);
+        return 0;
+}
+
 static int pseries_memory_notifier(struct notifier_block *nb,
                                 unsigned long action, void *node)
 {
@@ -72,6 +113,8 @@ static int pseries_memory_notifier(struct notifier_block *nb,
 
         switch (action) {
         case PSERIES_RECONFIG_ADD:
+                if (pseries_add_memory(node))
+                        err = NOTIFY_BAD;
                 break;
         case PSERIES_RECONFIG_REMOVE:
                 if (pseries_remove_memory(node))