Commit d2238cb6 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

acpi: cpuhp: implement hot-add parts of CPU hotplug interface 



it adds hw registers needed for handling CPU hot-add and
corresponding AML methods to handle hot-add events on
guest side.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ac35f13b

hw/acpi/cpu.c

+149 −1
Original line number Diff line number Diff line
@@ -7,6 +7,13 @@ 
#define ACPI_CPU_HOTPLUG_REG_LEN 12

#define ACPI_CPU_SELECTOR_OFFSET_WR 0

#define ACPI_CPU_FLAGS_OFFSET_RW 4

#define ACPI_CPU_CMD_OFFSET_WR 5

#define ACPI_CPU_CMD_DATA_OFFSET_RW 8



enum {

    CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0,

    CPHP_CMD_MAX

};



static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr, unsigned size)

{
@@ -22,8 +29,19 @@ static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr, unsigned size) 
    switch (addr) {

    case ACPI_CPU_FLAGS_OFFSET_RW: /* pack and return is_* fields */

        val |= cdev->cpu ? 1 : 0;

        val |= cdev->is_inserting ? 2 : 0;

        trace_cpuhp_acpi_read_flags(cpu_st->selector, val);

        break;

    case ACPI_CPU_CMD_DATA_OFFSET_RW:

        switch (cpu_st->command) {

        case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD:

           val = cpu_st->selector;

           break;

        default:

           break;

        }

        trace_cpuhp_acpi_read_cmd_data(cpu_st->selector, val);

        break;

    default:

        break;

    }
@@ -34,6 +52,7 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, 
                           unsigned int size)

{

    CPUHotplugState *cpu_st = opaque;

    AcpiCpuStatus *cdev;



    assert(cpu_st->dev_count);
@@ -49,6 +68,33 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, 
        cpu_st->selector = data;

        trace_cpuhp_acpi_write_idx(cpu_st->selector);

        break;

    case ACPI_CPU_FLAGS_OFFSET_RW: /* set is_* fields  */

        cdev = &cpu_st->devs[cpu_st->selector];

        if (data & 2) { /* clear insert event */

            cdev->is_inserting = false;

            trace_cpuhp_acpi_clear_inserting_evt(cpu_st->selector);

        }

        break;

    case ACPI_CPU_CMD_OFFSET_WR:

        trace_cpuhp_acpi_write_cmd(cpu_st->selector, data);

        if (data < CPHP_CMD_MAX) {

            cpu_st->command = data;

            if (cpu_st->command == CPHP_GET_NEXT_CPU_WITH_EVENT_CMD) {

                uint32_t iter = cpu_st->selector;



                do {

                    cdev = &cpu_st->devs[iter];

                    if (cdev->is_inserting) {

                        cpu_st->selector = iter;

                        trace_cpuhp_acpi_cpu_has_events(cpu_st->selector,

                            cdev->is_inserting);

                        break;

                    }

                    iter = iter + 1 < cpu_st->dev_count ? iter + 1 : 0;

                } while (iter != cpu_st->selector);

            }

        }

        break;

    default:

        break;

    }
@@ -111,7 +157,22 @@ void acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, 
    }



    cdev->cpu = CPU(dev);

    if (dev->hotplugged) {

        cdev->is_inserting = true;

        acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS);

    }

}



static const VMStateDescription vmstate_cpuhp_sts = {

    .name = "CPU hotplug device state",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField[]) {

        VMSTATE_BOOL(is_inserting, AcpiCpuStatus),

        VMSTATE_END_OF_LIST()

    }

};



const VMStateDescription vmstate_cpu_hotplug = {

    .name = "CPU hotplug state",
@@ -120,6 +181,9 @@ const VMStateDescription vmstate_cpu_hotplug = { 
    .minimum_version_id_old = 1,

    .fields      = (VMStateField[]) {

        VMSTATE_UINT32(selector, CPUHotplugState),

        VMSTATE_UINT8(command, CPUHotplugState),

        VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, CPUHotplugState, dev_count,

                                             vmstate_cpuhp_sts, AcpiCpuStatus),

        VMSTATE_END_OF_LIST()

    }

};
@@ -128,13 +192,19 @@ const VMStateDescription vmstate_cpu_hotplug = { 
#define CPUHP_RES_DEVICE  "PRES"

#define CPU_LOCK          "CPLK"

#define CPU_STS_METHOD    "CSTA"

#define CPU_SCAN_METHOD   "CSCN"

#define CPU_NOTIFY_METHOD "CTFY"



#define CPU_ENABLED       "CPEN"

#define CPU_SELECTOR      "CSEL"

#define CPU_COMMAND       "CCMD"

#define CPU_DATA          "CDAT"

#define CPU_INSERT_EVENT  "CINS"



void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,

                    hwaddr io_base,

                    const char *res_root)

                    const char *res_root,

                    const char *event_handler_method)

{

    Aml *ifctx;

    Aml *field;
@@ -147,6 +217,9 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
    MachineClass *mc = MACHINE_GET_CLASS(machine);

    CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);

    char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root);

    Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL);

    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);

    AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj);



    cpu_ctrl_dev = aml_device("%s", cphp_res_path);

    {
@@ -173,11 +246,18 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
        aml_append(field, aml_reserved_field(ACPI_CPU_FLAGS_OFFSET_RW * 8));

        /* 1 if enabled, read only */

        aml_append(field, aml_named_field(CPU_ENABLED, 1));

        /* (read) 1 if has a insert event. (write) 1 to clear event */

        aml_append(field, aml_named_field(CPU_INSERT_EVENT, 1));

        aml_append(field, aml_reserved_field(6));

        aml_append(field, aml_named_field(CPU_COMMAND, 8));

        aml_append(cpu_ctrl_dev, field);



        field = aml_field("PRST", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE);

        /* CPU selector, write only */

        aml_append(field, aml_named_field(CPU_SELECTOR, 32));

        /* flags + cmd + 2byte align */

        aml_append(field, aml_reserved_field(4 * 8));

        aml_append(field, aml_named_field(CPU_DATA, 32));

        aml_append(cpu_ctrl_dev, field);



    }
@@ -189,10 +269,27 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
        Aml *ctrl_lock = aml_name("%s.%s", cphp_res_path, CPU_LOCK);

        Aml *cpu_selector = aml_name("%s.%s", cphp_res_path, CPU_SELECTOR);

        Aml *is_enabled = aml_name("%s.%s", cphp_res_path, CPU_ENABLED);

        Aml *cpu_cmd = aml_name("%s.%s", cphp_res_path, CPU_COMMAND);

        Aml *cpu_data = aml_name("%s.%s", cphp_res_path, CPU_DATA);

        Aml *ins_evt = aml_name("%s.%s", cphp_res_path, CPU_INSERT_EVENT);



        aml_append(cpus_dev, aml_name_decl("_HID", aml_string("ACPI0010")));

        aml_append(cpus_dev, aml_name_decl("_CID", aml_eisaid("PNP0A05")));



        method = aml_method(CPU_NOTIFY_METHOD, 2, AML_NOTSERIALIZED);

        for (i = 0; i < arch_ids->len; i++) {

            Aml *cpu = aml_name(CPU_NAME_FMT, i);

            Aml *uid = aml_arg(0);

            Aml *event = aml_arg(1);



            ifctx = aml_if(aml_equal(uid, aml_int(i)));

            {

                aml_append(ifctx, aml_notify(cpu, event));

            }

            aml_append(method, ifctx);

        }

        aml_append(cpus_dev, method);



        method = aml_method(CPU_STS_METHOD, 1, AML_SERIALIZED);

        {

            Aml *idx = aml_arg(0);
@@ -211,10 +308,41 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
        }

        aml_append(cpus_dev, method);



        method = aml_method(CPU_SCAN_METHOD, 0, AML_SERIALIZED);

        {

            Aml *while_ctx;

            Aml *has_event = aml_local(0);

            Aml *dev_chk = aml_int(1);

            Aml *next_cpu_cmd = aml_int(CPHP_GET_NEXT_CPU_WITH_EVENT_CMD);



            aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));

            aml_append(method, aml_store(one, has_event));

            while_ctx = aml_while(aml_equal(has_event, one));

            {

                 /* clear loop exit condition, ins_evt check

                  * will set it to 1 while next_cpu_cmd returns a CPU

                  * with events */

                 aml_append(while_ctx, aml_store(zero, has_event));

                 aml_append(while_ctx, aml_store(next_cpu_cmd, cpu_cmd));

                 ifctx = aml_if(aml_equal(ins_evt, one));

                 {

                     aml_append(ifctx,

                         aml_call2(CPU_NOTIFY_METHOD, cpu_data, dev_chk));

                     aml_append(ifctx, aml_store(one, ins_evt));

                     aml_append(ifctx, aml_store(one, has_event));

                 }

                 aml_append(while_ctx, ifctx);

            }

            aml_append(method, while_ctx);

            aml_append(method, aml_release(ctrl_lock));

        }

        aml_append(cpus_dev, method);



        /* build Processor object for each processor */

        for (i = 0; i < arch_ids->len; i++) {

            Aml *dev;

            Aml *uid = aml_int(i);

            GArray *madt_buf = g_array_new(0, 1, 1);

            int arch_id = arch_ids->cpus[i].arch_id;



            if (opts.apci_1_compatible && arch_id < 255) {
@@ -229,12 +357,32 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
            aml_append(method, aml_return(aml_call1(CPU_STS_METHOD, uid)));

            aml_append(dev, method);



            /* build _MAT object */

            assert(adevc && adevc->madt_cpu);

            adevc->madt_cpu(adev, i, arch_ids, madt_buf);

            switch (madt_buf->data[0]) {

            case ACPI_APIC_PROCESSOR: {

                AcpiMadtProcessorApic *apic = (void *)madt_buf->data;

                apic->flags = cpu_to_le32(1);

                break;

            }

            default:

                assert(0);

            }

            aml_append(dev, aml_name_decl("_MAT",

                aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data)));

            g_array_free(madt_buf, true);



            aml_append(cpus_dev, dev);

        }

    }

    aml_append(sb_scope, cpus_dev);

    aml_append(table, sb_scope);



    method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);

    aml_append(method, aml_call0("\\_SB.CPUS." CPU_SCAN_METHOD));

    aml_append(table, method);



    g_free(cphp_res_path);

    g_free(arch_ids);

}

hw/acpi/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -21,3 +21,7 @@ mhp_acpi_pc_dimm_delete_failed(uint32_t slot) "slot[0x%"PRIx32"] pc-dimm delete 
cpuhp_acpi_invalid_idx_selected(uint32_t idx) "0x%"PRIx32

cpuhp_acpi_read_flags(uint32_t idx, uint8_t flags) "idx[0x%"PRIx32"] flags: 0x%"PRIx8

cpuhp_acpi_write_idx(uint32_t idx) "set active cpu idx: 0x%"PRIx32

cpuhp_acpi_write_cmd(uint32_t idx, uint8_t cmd) "idx[0x%"PRIx32"] cmd: 0x%"PRIx8

cpuhp_acpi_read_cmd_data(uint32_t idx, uint32_t data) "idx[0x%"PRIx32"] data: 0x%"PRIx32

cpuhp_acpi_cpu_has_events(uint32_t idx, bool ins) "idx[0x%"PRIx32"] inserting: %d"

cpuhp_acpi_clear_inserting_evt(uint32_t idx) "idx[0x%"PRIx32"]"

include/hw/acpi/cpu.h

+4 −1
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ 
typedef struct AcpiCpuStatus {

    struct CPUState *cpu;

    uint64_t arch_id;

    bool is_inserting;

} AcpiCpuStatus;



typedef struct CPUHotplugState {

    MemoryRegion ctrl_reg;

    uint32_t selector;

    uint8_t command;

    uint32_t dev_count;

    AcpiCpuStatus *devs;

} CPUHotplugState;
@@ -41,7 +43,8 @@ typedef struct CPUHotplugFeatures { 


void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,

                    hwaddr io_base,

                    const char *res_root);

                    const char *res_root,

                    const char *event_handler_method);



extern const VMStateDescription vmstate_cpu_hotplug;

#define VMSTATE_CPU_HOTPLUG(cpuhp, state) \