summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-12-22 21:17:11 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-01-18 00:44:42 +1100
commit5eae82cab5d7e13292d53205c0cc145c110c92be (patch)
treee94a5f933fca3ff28e2dfc60ad6406c0990f7e57
parent47fee31dbdbd642d444c67a4df814339f6d8dd61 (diff)
powerpc/pseries: lift RTAS limit for radix
With the previous patch to switch to 64-bit mode after returning from RTAS and before doing any memory accesses, the RMA limit need not be clamped to 1GB to avoid RTAS bugs. Keep the 1GB limit for older firmware (although this is more of a kernel concern than RTAS), and remove it starting with POWER9. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/mm/pgtable-radix.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index 60927d019bbf..573a9a2ee455 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -629,23 +629,10 @@ void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,
*/
BUG_ON(first_memblock_base != 0);
- if (!early_cpu_has_feature(CPU_FTR_HVMODE)) {
- /*
- * Radix mode guests are not limited by RMA / VRMA addressing.
- *
- * We do clamp addresses to 1GB to avoid some funky things
- * such as RTAS bugs.
- */
- ppc64_rma_size = 0x40000000;
- /*
- * Finally limit subsequent allocations. We really don't want
- * to limit the memblock allocations to rma_size. FIXME!! should
- * we even limit at all ?
- */
- memblock_set_current_limit(first_memblock_base + first_memblock_size);
- } else {
- ppc64_rma_size = ULONG_MAX;
- }
+ /*
+ * Radix mode is not limited by RMA / VRMA addressing.
+ */
+ ppc64_rma_size = ULONG_MAX;
}
#ifdef CONFIG_MEMORY_HOTPLUG