aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/book3s64/hash_utils.c
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>2020-06-22 12:10:19 +0530
committerMichael Ellerman <mpe@ellerman.id.au>2020-06-22 20:29:51 +1000
commit86590e524ee834b629afc55d8e5786091fbf84cc (patch)
tree5aa1de4f8edefdb9c2e3d69c7c750e5c9192b7c0 /arch/powerpc/mm/book3s64/hash_utils.c
parentpowerpc/4xx: ppc4xx compile flag optimizations (diff)
downloadlinux-dev-86590e524ee834b629afc55d8e5786091fbf84cc.tar.xz
linux-dev-86590e524ee834b629afc55d8e5786091fbf84cc.zip
powerpc/mm/book3s64: Skip 16G page reservation with radix
With hash translation, the hypervisor can hint the LPAR about 16GB contiguous range via ibm,expected#pages. The kernel marks the range specified in the device tree as reserved. Avoid doing this when using radix translation. Radix translation only supports 1G gigantic hugepage and kernel can do the 1G gigantic hugepage allocation via early memblock reservation. This can be done because with radix translation pages are not required to be contiguous on the host. 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/20200622064019.16682-1-aneesh.kumar@linux.ibm.com
Diffstat (limited to '')
-rw-r--r--arch/powerpc/mm/book3s64/hash_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 084287fb2908..eec6f4e5e481 100644
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -596,7 +596,7 @@ static void __init htab_scan_page_sizes(void)
}
#ifdef CONFIG_HUGETLB_PAGE
- if (!hugetlb_disabled) {
+ if (!hugetlb_disabled && !early_radix_enabled() ) {
/* Reserve 16G huge page memory sections for huge pages */
of_scan_flat_dt(htab_dt_scan_hugepage_blocks, NULL);
}