[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/16] hw/i386: Move arch_id decode inside x86_cpus_init
From: |
Babu Moger |
Subject: |
[PATCH v4 14/16] hw/i386: Move arch_id decode inside x86_cpus_init |
Date: |
Thu, 13 Feb 2020 12:17:59 -0600 |
User-agent: |
StGit/unknown-version |
Apicid calculation depends on knowing the total number of numa nodes
for EPYC cpu models. Right now, we are calculating the arch_id while
parsing the numa(parse_numa). At this time, it is not known how many
total numa nodes are configured in the system.
Move the arch_id inside x86_cpus_init. At this time smp parameter is already
completed and numa node information is available.
Signed-off-by: Babu Moger <address@hidden>
---
hw/i386/x86.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index b825861b85..472dc3eb77 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -127,6 +127,9 @@ void x86_cpus_init(X86MachineState *x86ms, int
default_cpu_version)
MachineState *ms = MACHINE(x86ms);
MachineClass *mc = MACHINE_GET_CLASS(x86ms);
+ /* Initialize apicid handlers first */
+ x86_check_apicid_handlers(ms);
+
x86_cpu_set_default_version(default_cpu_version);
/*
@@ -140,6 +143,11 @@ void x86_cpus_init(X86MachineState *x86ms, int
default_cpu_version)
x86ms->apic_id_limit = x86_cpu_apic_id_from_index(x86ms,
ms->smp.max_cpus - 1) +
1;
possible_cpus = mc->possible_cpu_arch_ids(ms);
+
+ for (i = 0; i < ms->smp.cpus; i++) {
+ ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(x86ms,
i);
+ }
+
for (i = 0; i < ms->smp.cpus; i++) {
x86_cpu_new(x86ms, possible_cpus->cpus[i].arch_id, &error_fatal);
}
@@ -164,8 +172,7 @@ int64_t x86_get_default_cpu_node_id(const MachineState *ms,
int idx)
init_topo_info(&topo_info, x86ms);
assert(idx < ms->possible_cpus->len);
- x86ms->topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id,
- &topo_info, &topo_ids);
+ x86_topo_ids_from_idx(&topo_info, idx, &topo_ids);
return topo_ids.pkg_id % ms->numa_state->num_nodes;
}
@@ -199,10 +206,7 @@ const CPUArchIdList
*x86_possible_cpu_arch_ids(MachineState *ms)
ms->possible_cpus->cpus[i].type = ms->cpu_type;
ms->possible_cpus->cpus[i].vcpus_count = 1;
- ms->possible_cpus->cpus[i].arch_id =
- x86_cpu_apic_id_from_index(x86ms, i);
- x86ms->topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,
- &topo_info, &topo_ids);
+ x86_topo_ids_from_idx(&topo_info, i, &topo_ids);
ms->possible_cpus->cpus[i].props.has_socket_id = true;
ms->possible_cpus->cpus[i].props.socket_id = topo_ids.pkg_id;
if (x86ms->smp_dies > 1) {
- [PATCH v4 04/16] hw/i386: Introduce init_topo_info to initialize X86CPUTopoInfo, (continued)
- [PATCH v4 04/16] hw/i386: Introduce init_topo_info to initialize X86CPUTopoInfo, Babu Moger, 2020/02/13
- [PATCH v4 05/16] machine: Add SMP Sockets in CpuTopology, Babu Moger, 2020/02/13
- [PATCH v4 06/16] hw/i386: Update structures for nodes_per_pkg, Babu Moger, 2020/02/13
- [PATCH v4 07/16] hw/i386: Rename apicid_from_topo_ids to x86_apicid_from_topo_ids, Babu Moger, 2020/02/13
- [PATCH v4 08/16] hw/386: Add EPYC mode topology decoding functions, Babu Moger, 2020/02/13
- [PATCH v4 09/16] target/i386: Cleanup and use the EPYC mode topology functions, Babu Moger, 2020/02/13
- [PATCH v4 10/16] hw/i386: Introduce apicid functions inside X86MachineState, Babu Moger, 2020/02/13
- [PATCH v4 11/16] target/i386: Load apicid model specific handlers from X86CPUDefinition, Babu Moger, 2020/02/13
- [PATCH v4 12/16] hw/i386: Use the apicid handlers from X86MachineState, Babu Moger, 2020/02/13
- [PATCH v4 13/16] target/i386: Add EPYC model specific handlers, Babu Moger, 2020/02/13
- [PATCH v4 14/16] hw/i386: Move arch_id decode inside x86_cpus_init,
Babu Moger <=
- [PATCH v4 15/16] i386: Fix pkg_id offset for EPYC cpu models, Babu Moger, 2020/02/13
- [PATCH v4 16/16] tests: Update the Unit tests, Babu Moger, 2020/02/13