powerpc/mm: Fix check of multiple 16G pages from device tree
authorRui Teng <rui.teng@linux.vnet.ibm.com>
Thu, 12 Jan 2017 09:09:06 +0000 (17:09 +0800)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Jul 2017 06:56:58 +0000 (16:56 +1000)
The offset of hugepage block will not be 16G, if the expected
page is more than one. Calculate the totol size instead of the
hardcode value.

Fixes: 4792adbac9eb ("powerpc: Don't use a 16G page if beyond mem= limits")
Signed-off-by: Rui Teng <rui.teng@linux.vnet.ibm.com>
Tested-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/hash_utils_64.c

index 7a20669c19e7258d979d60a19f3acec378c9dbad..7419fc1854ad2277c8df613c718fbf202669d221 100644 (file)
@@ -507,7 +507,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node,
        printk(KERN_INFO "Huge page(16GB) memory: "
                        "addr = 0x%lX size = 0x%lX pages = %d\n",
                        phys_addr, block_size, expected_pages);
-       if (phys_addr + (16 * GB) <= memblock_end_of_DRAM()) {
+       if (phys_addr + block_size * expected_pages <= memblock_end_of_DRAM()) {
                memblock_reserve(phys_addr, block_size * expected_pages);
                add_gpage(phys_addr, block_size, expected_pages);
        }