[PATCH] powerpc/pseries: Auto online hotplugged memory

[Nathan Fontenot]

Auto online hotplugged memory

A recent update (commit id 31bc3858ea3) to the core mm hotplug code
introduced the memhp_auto_online variable to allow for automatically
onlining memory that is added.

This patch update the pseries memory hotplug code to enable this so that
any memory DLPAR added to the system is automatically onlined. The code
to add the memory block for memory added from add_memory() is removed as
this is not needed, the memory_add code does this.

Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com>
---
 arch/powerpc/platforms/pseries/hotplug-memory.c |   52 +++++------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c 
b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 2ce1385..03f6169 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -533,50 +533,11 @@ static int dlpar_memory_remove_by_index(u32 drc_index, 
struct property *prop)
 
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
-static int dlpar_add_lmb_memory(struct of_drconf_cell *lmb)
+static int dlpar_add_lmb(struct of_drconf_cell *lmb)
 {
-       struct memory_block *mem_block;
        unsigned long block_sz;
        int nid, rc;
 
-       block_sz = memory_block_size_bytes();
-
-       /* Find the node id for this address */
-       nid = memory_add_physaddr_to_nid(lmb->base_addr);
-
-       /* Add the memory */
-       rc = add_memory(nid, lmb->base_addr, block_sz);
-       if (rc)
-               return rc;
-
-       /* Register this block of memory */
-       rc = memblock_add(lmb->base_addr, block_sz);
-       if (rc) {
-               remove_memory(nid, lmb->base_addr, block_sz);
-               return rc;
-       }
-
-       mem_block = lmb_to_memblock(lmb);
-       if (!mem_block) {
-               remove_memory(nid, lmb->base_addr, block_sz);
-               return -EINVAL;
-       }
-
-       rc = device_online(&mem_block->dev);
-       put_device(&mem_block->dev);
-       if (rc) {
-               remove_memory(nid, lmb->base_addr, block_sz);
-               return rc;
-       }
-
-       lmb->flags |= DRCONF_MEM_ASSIGNED;
-       return 0;
-}
-
-static int dlpar_add_lmb(struct of_drconf_cell *lmb)
-{
-       int rc;
-
        if (lmb->flags & DRCONF_MEM_ASSIGNED)
                return -EINVAL;
 
@@ -592,10 +553,19 @@ static int dlpar_add_lmb(struct of_drconf_cell *lmb)
                return rc;
        }
 
-       rc = dlpar_add_lmb_memory(lmb);
+       block_sz = memory_block_size_bytes();
+
+       /* Find the node id for this address */
+       nid = memory_add_physaddr_to_nid(lmb->base_addr);
+
+       /* Add and online memory */
+       memhp_auto_online = true;
+       rc = add_memory(nid, lmb->base_addr, block_sz);
        if (rc) {
                dlpar_remove_device_tree_lmb(lmb);
                dlpar_release_drc(lmb->drc_index);
+       } else {
+               lmb->flags |= DRCONF_MEM_ASSIGNED;
        }
 
        return rc;

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev