Commit 33d7a288 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

pc: apic_common: Extend APIC ID property to 32bit 



ACPI ID is 32 bit wide on CPUs with x2APIC support.
Extend 'id' property to support it.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 6a91cf04

hw/intc/apic_common.c

+45 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qapi/error.h"

#include "qemu-common.h"

#include "cpu.h"

#include "qapi/visitor.h"

#include "hw/i386/apic.h"

#include "hw/i386/apic_internal.h"

#include "trace.h"
@@ -428,7 +429,6 @@ static const VMStateDescription vmstate_apic_common = { 
};



static Property apic_properties_common[] = {

    DEFINE_PROP_UINT8("id", APICCommonState, id, -1),

    DEFINE_PROP_UINT8("version", APICCommonState, version, 0x14),

    DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT,

                    true),
@@ -437,6 +437,49 @@ static Property apic_properties_common[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static void apic_common_get_id(Object *obj, Visitor *v, const char *name,

                               void *opaque, Error **errp)

{

    APICCommonState *s = APIC_COMMON(obj);

    int64_t value;



    value = s->apicbase & MSR_IA32_APICBASE_EXTD ? s->initial_apic_id : s->id;

    visit_type_int(v, name, &value, errp);

}



static void apic_common_set_id(Object *obj, Visitor *v, const char *name,

                               void *opaque, Error **errp)

{

    APICCommonState *s = APIC_COMMON(obj);

    DeviceState *dev = DEVICE(obj);

    Error *local_err = NULL;

    int64_t value;



    if (dev->realized) {

        qdev_prop_set_after_realize(dev, name, errp);

        return;

    }



    visit_type_int(v, name, &value, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    s->initial_apic_id = value;

    s->id = (uint8_t)value;

}



static void apic_common_initfn(Object *obj)

{

    APICCommonState *s = APIC_COMMON(obj);



    s->id = s->initial_apic_id = -1;

    object_property_add(obj, "id", "int",

                        apic_common_get_id,

                        apic_common_set_id, NULL, NULL, NULL);

}



static void apic_common_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);
@@ -456,6 +499,7 @@ static const TypeInfo apic_common_type = { 
    .name = TYPE_APIC_COMMON,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(APICCommonState),

    .instance_init = apic_common_initfn,

    .class_size = sizeof(APICCommonClass),

    .class_init = apic_common_class_init,

    .abstract = true,

include/hw/i386/apic_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ struct APICCommonState { 
    MemoryRegion io_memory;

    X86CPU *cpu;

    uint32_t apicbase;

    uint8_t id;

    uint8_t id; /* legacy APIC ID */

    uint32_t initial_apic_id;

    uint8_t version;

    uint8_t arb_id;

    uint8_t tpr;

target-i386/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -2945,7 +2945,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) 
                              OBJECT(cpu->apic_state), &error_abort);

    object_unref(OBJECT(cpu->apic_state));



    qdev_prop_set_uint8(cpu->apic_state, "id", cpu->apic_id);

    qdev_prop_set_uint32(cpu->apic_state, "id", cpu->apic_id);

    /* TODO: convert to link<> */

    apic = APIC_COMMON(cpu->apic_state);

    apic->cpu = cpu;

target-i386/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
#define MSR_IA32_APICBASE               0x1b

#define MSR_IA32_APICBASE_BSP           (1<<8)

#define MSR_IA32_APICBASE_ENABLE        (1<<11)

#define MSR_IA32_APICBASE_EXTD          (1 << 10)

#define MSR_IA32_APICBASE_BASE          (0xfffffU<<12)

#define MSR_IA32_FEATURE_CONTROL        0x0000003a

#define MSR_TSC_ADJUST                  0x0000003b