diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-07-03 13:10:03 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-09-08 12:50:47 +0200 |
| commit | 81014ac2b88b5fd275c33b463efe306668e920ed (patch) | |
| tree | e7e021f0e8f5f25d8f82a3f4d3606c048f4a085e /hw/ppc/spapr.c | |
| parent | 26a8c353bf0ffb485f4a68bea97efcef7d2bbaa3 (diff) | |
| download | qemu-81014ac2b88b5fd275c33b463efe306668e920ed.tar.gz qemu-81014ac2b88b5fd275c33b463efe306668e920ed.tar.bz2 qemu-81014ac2b88b5fd275c33b463efe306668e920ed.zip | |
spapr: Use DT memory node rendering helper for other nodes
This finishes refactoring by using the spapr_populate_memory_node helper
for all nodes and removing leftovers from spapr_populate_memory().
This is not a part of the previous patch because the patches look
nicer apart.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc/spapr.c')
| -rw-r--r-- | hw/ppc/spapr.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 28c857834f..9b9b6c4775 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -661,13 +661,8 @@ static void spapr_populate_memory_node(void *fdt, int nodeid, hwaddr start, static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt) { - uint32_t associativity[] = {cpu_to_be32(0x4), cpu_to_be32(0x0), - cpu_to_be32(0x0), cpu_to_be32(0x0), - cpu_to_be32(0x0)}; - char mem_name[32]; hwaddr node0_size, mem_start, node_size; - uint64_t mem_reg_property[2]; - int i, off; + int i; /* memory node(s) */ if (nb_numa_nodes > 1 && numa_info[0].node_mem < ram_size) { @@ -688,7 +683,6 @@ static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt) /* RAM: Node 1 and beyond */ mem_start = node0_size; for (i = 1; i < nb_numa_nodes; i++) { - mem_reg_property[0] = cpu_to_be64(mem_start); if (mem_start >= ram_size) { node_size = 0; } else { @@ -697,16 +691,7 @@ static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt) node_size = ram_size - mem_start; } } - mem_reg_property[1] = cpu_to_be64(node_size); - associativity[3] = associativity[4] = cpu_to_be32(i); - sprintf(mem_name, "memory@" TARGET_FMT_lx, mem_start); - off = fdt_add_subnode(fdt, 0, mem_name); - _FDT(off); - _FDT((fdt_setprop_string(fdt, off, "device_type", "memory"))); - _FDT((fdt_setprop(fdt, off, "reg", mem_reg_property, - sizeof(mem_reg_property)))); - _FDT((fdt_setprop(fdt, off, "ibm,associativity", associativity, - sizeof(associativity)))); + spapr_populate_memory_node(fdt, i, mem_start, node_size); mem_start += node_size; } |