[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v0 2/5] spapr: Populate ibm, associativity-looku
From: |
Bharata B Rao |
Subject: |
[Qemu-devel] [RFC PATCH v0 2/5] spapr: Populate ibm, associativity-lookup-arrays correctly for non-NUMA |
Date: |
Mon, 3 Aug 2015 11:05:40 +0530 |
When NUMA isn't configured explicitly, assume node 0 is present for
the purpose of creating ibm,associativity-lookup-arrays property
under ibm,dynamic-reconfiguration-memory DT node. This ensures that
the associativity index property is correctly updated in ibm,dynamic-memory
for the LMB that is hotplugged.
Signed-off-by: Bharata B Rao <address@hidden>
---
hw/ppc/spapr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 6d9cbd9..7f94f97 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -728,6 +728,7 @@ static int spapr_populate_drconf_memory(sPAPRMachineState
*spapr, void *fdt)
uint32_t nr_lmbs = machine->maxram_size/lmb_size - nr_rma_lmbs;
uint32_t nr_assigned_lmbs = machine->ram_size/lmb_size - nr_rma_lmbs;
uint32_t *int_buf, *cur_index, buf_len;
+ int nr_nodes = nb_numa_nodes ? nb_numa_nodes : 1;
/* Allocate enough buffer size to fit in ibm,dynamic-memory */
buf_len = nr_lmbs * SPAPR_DR_LMB_LIST_ENTRY_SIZE * sizeof(uint32_t) +
@@ -793,10 +794,10 @@ static int spapr_populate_drconf_memory(sPAPRMachineState
*spapr, void *fdt)
/* ibm,associativity-lookup-arrays */
cur_index = int_buf;
- int_buf[0] = cpu_to_be32(nb_numa_nodes);
+ int_buf[0] = cpu_to_be32(nr_nodes);
int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */
cur_index += 2;
- for (i = 0; i < nb_numa_nodes; i++) {
+ for (i = 0; i < nr_nodes; i++) {
uint32_t associativity[] = {
cpu_to_be32(0x0),
cpu_to_be32(0x0),
--
2.1.0
[Qemu-devel] [RFC PATCH v0 3/5] spapr: Revert to address@hidden representation for non-hotplugged memory, Bharata B Rao, 2015/08/03
[Qemu-devel] [RFC PATCH v0 5/5] spapr: Move memory hotplug to RTAS_LOG_V6_HP_ID_DRC_COUNT type, Bharata B Rao, 2015/08/03
Re: [Qemu-devel] [RFC PATCH v0 0/5] spapr-next: Memory hotplug updates, David Gibson, 2015/08/11