summaryrefslogtreecommitdiffstats
path: root/hw/ppc/spapr_numa.c
diff options
context:
space:
mode:
authorDaniel Henrique Barboza2020-09-04 00:06:34 +0200
committerDavid Gibson2020-09-08 02:08:43 +0200
commit8f86a408241264db605da9a1215a409475a60bd0 (patch)
treefb9c1cdc49a43492d7389df0afb0c5d8b0ed9a48 /hw/ppc/spapr_numa.c
parentspapr: introduce SpaprMachineState::numa_assoc_array (diff)
downloadqemu-8f86a408241264db605da9a1215a409475a60bd0.tar.gz
qemu-8f86a408241264db605da9a1215a409475a60bd0.tar.xz
qemu-8f86a408241264db605da9a1215a409475a60bd0.zip
spapr, spapr_numa: handle vcpu ibm,associativity
Vcpus have an additional paramenter to be appended, vcpu_id. This also changes the size of the of property itself, which is being represented in index 0 of numa_assoc_array[cpu->node_id], and defaults to MAX_DISTANCE_REF_POINTS for all cases but vcpus. All this logic makes more sense in spapr_numa.c, where we handle everything NUMA and associativity. A new helper spapr_numa_fixup_cpu_dt() was added, and spapr.c uses it the same way as it was using the former spapr_fixup_cpu_numa_dt(). Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Message-Id: <20200903220639.563090-3-danielhb413@gmail.com> [dwg: Correct uint to int type, which can break windows builds] Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/spapr_numa.c')
-rw-r--r--hw/ppc/spapr_numa.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index f6b6fe648f..523801fb14 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -45,6 +45,33 @@ void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt,
sizeof(spapr->numa_assoc_array[nodeid]))));
}
+int spapr_numa_fixup_cpu_dt(SpaprMachineState *spapr, void *fdt,
+ int offset, PowerPCCPU *cpu)
+{
+ int vcpu_assoc_size = NUMA_ASSOC_SIZE + 1;
+ uint32_t vcpu_assoc[vcpu_assoc_size];
+ int index = spapr_get_vcpu_id(cpu);
+ int i;
+
+ /*
+ * VCPUs have an extra 'cpu_id' value in ibm,associativity
+ * compared to other resources. Increment the size at index
+ * 0, copy all associativity domains already set, then put
+ * cpu_id last.
+ */
+ vcpu_assoc[0] = cpu_to_be32(MAX_DISTANCE_REF_POINTS + 1);
+
+ for (i = 1; i <= MAX_DISTANCE_REF_POINTS; i++) {
+ vcpu_assoc[i] = spapr->numa_assoc_array[cpu->node_id][i];
+ }
+
+ vcpu_assoc[vcpu_assoc_size - 1] = cpu_to_be32(index);
+
+ /* Advertise NUMA via ibm,associativity */
+ return fdt_setprop(fdt, offset, "ibm,associativity",
+ vcpu_assoc, sizeof(vcpu_assoc));
+}
+
/*
* Helper that writes ibm,associativity-reference-points and
* max-associativity-domains in the RTAS pointed by @rtas