powerpc/memhotplug: Make lmb size 64bit

Similar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic")
make sure different variables tracking lmb_size are updated to be 64 bit.

This was found by code audit.

Cc: stable@vger.kernel.org
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201007114836.282468-3-aneesh.kumar@linux.ibm.com

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 9a533ac..ca5589a 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -277,7 +277,7 @@ static int dlpar_offline_lmb(struct drmem_lmb *lmb)
        return dlpar_change_lmb_state(lmb, false);
 }
 
-static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
+static int pseries_remove_memblock(unsigned long base, unsigned long memblock_size)
 {
        unsigned long block_sz, start_pfn;
        int sections_per_block;
@@ -308,10 +308,11 @@ out:
 
 static int pseries_remove_mem_node(struct device_node *np)
 {
-       const __be32 *regs;
+       const __be32 *prop;
        unsigned long base;
-       unsigned int lmb_size;
+       unsigned long lmb_size;
        int ret = -EINVAL;
+       int addr_cells, size_cells;
 
        /*
         * Check to see if we are actually removing memory
@@ -322,12 +323,19 @@ static int pseries_remove_mem_node(struct device_node *np)
        /*
         * Find the base address and size of the memblock
         */
-       regs = of_get_property(np, "reg", NULL);
-       if (!regs)
+       prop = of_get_property(np, "reg", NULL);
+       if (!prop)
                return ret;
 
-       base = be64_to_cpu(*(unsigned long *)regs);
-       lmb_size = be32_to_cpu(regs[3]);
+       addr_cells = of_n_addr_cells(np);
+       size_cells = of_n_size_cells(np);
+
+       /*
+        * "reg" property represents (addr,size) tuple.
+        */
+       base = of_read_number(prop, addr_cells);
+       prop += addr_cells;
+       lmb_size = of_read_number(prop, size_cells);
 
        pseries_remove_memblock(base, lmb_size);
        return 0;
@@ -564,7 +572,7 @@ static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index)
 
 #else
 static inline int pseries_remove_memblock(unsigned long base,
-                                         unsigned int memblock_size)
+                                         unsigned long memblock_size)
 {
        return -EOPNOTSUPP;
 }
@@ -888,10 +896,11 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
 
 static int pseries_add_mem_node(struct device_node *np)
 {
-       const __be32 *regs;
+       const __be32 *prop;
        unsigned long base;
-       unsigned int lmb_size;
+       unsigned long lmb_size;
        int ret = -EINVAL;
+       int addr_cells, size_cells;
 
        /*
         * Check to see if we are actually adding memory
@@ -902,12 +911,18 @@ static int pseries_add_mem_node(struct device_node *np)
        /*
         * Find the base and size of the memblock
         */
-       regs = of_get_property(np, "reg", NULL);
-       if (!regs)
+       prop = of_get_property(np, "reg", NULL);
+       if (!prop)
                return ret;
 
-       base = be64_to_cpu(*(unsigned long *)regs);
-       lmb_size = be32_to_cpu(regs[3]);
+       addr_cells = of_n_addr_cells(np);
+       size_cells = of_n_size_cells(np);
+       /*
+        * "reg" property represents (addr,size) tuple.
+        */
+       base = of_read_number(prop, addr_cells);
+       prop += addr_cells;
+       lmb_size = of_read_number(prop, size_cells);
 
        /*
         * Update memory region to represent the memory add