On return from rtas we access the paca variables and we have 64 bit
disabled. This requires us to limit paca in 32 bit range.

Fix this by setting ppc64_rma_size to first_memblock_size/1G range.

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
---
 arch/powerpc/mm/pgtable-radix.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index a5d0ae5630b3..52ed820a386a 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -339,7 +339,25 @@ void rearly_init_mmu_secondary(void)
 void rsetup_initial_memory_limit(phys_addr_t first_memblock_base,
                                phys_addr_t first_memblock_size)
 {
-       /* Finally limit subsequent allocations */
+       /* We don't currently support the first MEMBLOCK not mapping 0
+        * physical on those processors
+        */
+       BUG_ON(first_memblock_base != 0);
+       /*
+        * We limit the allocation that depend on ppc64_rma_size
+        * to first_memblock_size. We also clamp it to 1GB to
+        * avoid some funky things such as RTAS bugs.
+        *
+        * On radix config we really don't have a limitation
+        * on real mode access. But keeping it as above works
+        * well enough.
+        */
+       ppc64_rma_size = min_t(u64, first_memblock_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);
 }
 
-- 
2.5.0

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

Reply via email to