diff mbox series

[v3,2/3] hw/i386: Add a new check to configure smp dies for EPYC

Message ID 159681797161.9679.5653247810916709875.stgit@naples-babu.amd.com
State New
Headers show
Series [v3,1/3] i386: Simplify CPUID_8000_001E for AMD | expand

Commit Message

Moger, Babu Aug. 7, 2020, 4:32 p.m. UTC 
Adding a new check to warn the users to configure 'dies' when
topology is numa configured. It makes it easy to build the
topology for EPYC models.

Signed-off-by: Babu Moger <babu.moger@amd.com>
---
 hw/i386/x86.c |    7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 67bee1bcb8..2a6ce56ef1 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -138,6 +138,13 @@  void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
 
     /* Check for apicid encoding */
     if (cpu_x86_use_epyc_apic_id_encoding(ms->cpu_type)) {
+        if ((ms->numa_state->num_nodes > 0) &&
+            ms->numa_state->num_nodes != (ms->smp.sockets * x86ms->smp_dies)) {
+            error_setg(&error_fatal, "Numa configuration requires smp 'dies' "
+                       "parameter. Configure the cpu topology properly with "
+                       "max_cpus = sockets * dies * cores * threads");
+            return;
+        }
         x86_set_epyc_topo_handlers(ms);
     }