[Qemu-devel] [PATCH] spapr: make sure RMA is in first mode of first memory node

[Alexey Kardashevskiy <aik@ozlabs.ru>]

SLOF gets really confused if RTAS/device-tree and everything else
what SLOF can use is not in the very first block of the very first
memory node.

This makes sure that the RMA area is where SLOF expects it to be.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 hw/ppc/spapr.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 09dc635..09a5d94 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1113,7 +1113,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
     int i;
     MemoryRegion *sysmem = get_system_memory();
     MemoryRegion *ram = g_new(MemoryRegion, 1);
-    hwaddr rma_alloc_size;
+    hwaddr rma_alloc_size, node0_size;
     uint32_t initrd_base = 0;
     long kernel_size = 0, initrd_size = 0;
     long load_limit, rtas_limit, fw_size;
@@ -1154,6 +1154,12 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
             spapr->rma_size = MIN(spapr->rma_size, 0x10000000);
         }
     }
+    /*
+     * SLOF gets confused if RMA resides not in the first block
+     * of the first memory node so let's fix it.
+     */
+    node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size;
+    spapr->rma_size = MIN(spapr->rma_size, node0_size);
 
     /* We place the device tree and RTAS just below either the top of the RMA,
      * or just below 2GB, whichever is lowere, so that it can be
-- 
1.8.4.rc4