[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 1/8] spapr: move NUMA data init to do_client_architecture_sup
From: |
Daniel Henrique Barboza |
Subject: |
[RFC PATCH 1/8] spapr: move NUMA data init to do_client_architecture_support() |
Date: |
Mon, 14 Jun 2021 22:33:02 -0300 |
The pSeries machine will support a new NUMA affinity form, FORM2.
This new FORM will be negotiated via ibm,architecture-vec5 during
CAS. All artifacts and assumptions that are currently on use for
FORM1 affinity will be deprecated in a guest that chooses to use
FORM2.
This means that we're going to wait until CAS to determine whether
we're going to use FORM1 and FORM2. This patch starts doing that
by moving spapr_numa_associativity_init() from spapr_machine_init()
to do_client_architecture_support().
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 3 ---
hw/ppc/spapr_hcall.c | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 4dd90b75cc..dd57b30cff 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2790,9 +2790,6 @@ static void spapr_machine_init(MachineState *machine)
spapr->gpu_numa_id = spapr_numa_initial_nvgpu_numa_id(machine);
- /* Init numa_assoc_array */
- spapr_numa_associativity_init(spapr, machine);
-
if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) &&
ppc_type_check_compat(machine->cpu_type, CPU_POWERPC_LOGICAL_3_00, 0,
spapr->max_compat_pvr)) {
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index f25014afda..6d6ffcc92b 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -11,6 +11,7 @@
#include "helper_regs.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_cpu_core.h"
+#include "hw/ppc/spapr_numa.h"
#include "mmu-hash64.h"
#include "cpu-models.h"
#include "trace.h"
@@ -1197,6 +1198,9 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
spapr->cas_pre_isa3_guest = !spapr_ovec_test(ov1_guest, OV1_PPC_3_00);
spapr_ovec_cleanup(ov1_guest);
+ /* Init numa_assoc_array */
+ spapr_numa_associativity_init(spapr, MACHINE(spapr));
+
/*
* Ensure the guest asks for an interrupt mode we support;
* otherwise terminate the boot.
--
2.31.1
- [RFC PATCH 0/8] pSeries base FORM2 NUMA affinity support, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 1/8] spapr: move NUMA data init to do_client_architecture_support(),
Daniel Henrique Barboza <=
- [RFC PATCH 2/8] spapr_numa.c: split FORM1 code into helpers, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 3/8] spapr_numa.c: wait for CAS before writing rtas DT, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 4/8] spapr_numa.c: base FORM2 NUMA affinity support, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 5/8] spapr: simplify spapr_numa_associativity_init params, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 6/8] nvdimm: add PPC64 'device-node' property, Daniel Henrique Barboza, 2021/06/14
- [RFC PATCH 7/8] spapr_numa, spapar_nvdimm: write secondary NUMA domain for nvdimms, Daniel Henrique Barboza, 2021/06/14