Commit 7b225762 authored by Babu Moger's avatar Babu Moger Committed by Eduardo Habkost
Browse files

i386: Fix pkg_id offset for EPYC cpu models 



If the system is numa configured the pkg_offset needs
to be adjusted for EPYC cpu models. Fix it calling the
model specific handler.

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <158396725589.58170.16424607815207074485.stgit@naples-babu.amd.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 247b18c5

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 


    env->nr_dies = x86ms->smp_dies;

    env->nr_nodes = topo_info.nodes_per_pkg;

    env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);



    /*

     * If APIC ID is not set,

target/i386/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -5610,7 +5610,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, 
            *ecx |= CPUID_TOPOLOGY_LEVEL_SMT;

            break;

        case 1:

            *eax = apicid_pkg_offset(&topo_info);

            *eax = env->pkg_offset;

            *ebx = cs->nr_cores * cs->nr_threads;

            *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;

            break;
@@ -5644,7 +5644,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, 
            *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;

            break;

        case 2:

            *eax = apicid_pkg_offset(&topo_info);

            *eax = env->pkg_offset;

            *ebx = env->nr_dies * cs->nr_cores * cs->nr_threads;

            *ecx |= CPUID_TOPOLOGY_LEVEL_DIE;

            break;

target/i386/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1610,6 +1610,7 @@ typedef struct CPUX86State { 


    unsigned nr_dies;

    unsigned nr_nodes;

    unsigned pkg_offset;

} CPUX86State;



struct kvm_msrs;