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

acpi: cpuhp: add cpu._OST handling 



it adds HW and AML parts for CPU_Device._OST method
handling to allow OSPM reports status of hot-(un)plug
operation.
And extends QMP command query-acpi-ospm-status to report
CPU's OST info along with already reported PC-DIMM devices.

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 8872c25a

hw/acpi/cpu.c

+82 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include "hw/boards.h"

#include "hw/acpi/cpu.h"

#include "qapi/error.h"

#include "qapi-event.h"

#include "trace.h"



#define ACPI_CPU_HOTPLUG_REG_LEN 12
@@ -12,9 +13,42 @@ 


enum {

    CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0,

    CPHP_OST_EVENT_CMD = 1,

    CPHP_OST_STATUS_CMD = 2,

    CPHP_CMD_MAX

};



static ACPIOSTInfo *acpi_cpu_device_status(int idx, AcpiCpuStatus *cdev)

{

    ACPIOSTInfo *info = g_new0(ACPIOSTInfo, 1);



    info->slot_type = ACPI_SLOT_TYPE_CPU;

    info->slot = g_strdup_printf("%d", idx);

    info->source = cdev->ost_event;

    info->status = cdev->ost_status;

    if (cdev->cpu) {

        DeviceState *dev = DEVICE(cdev->cpu);

        if (dev->id) {

            info->device = g_strdup(dev->id);

            info->has_device = true;

        }

    }

    return info;

}



void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list)

{

    int i;



    for (i = 0; i < cpu_st->dev_count; i++) {

        ACPIOSTInfoList *elem = g_new0(ACPIOSTInfoList, 1);

        elem->value = acpi_cpu_device_status(i, &cpu_st->devs[i]);

        elem->next = NULL;

        **list = elem;

        *list = &elem->next;

    }

}



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

{

    uint64_t val = 0;
@@ -54,6 +88,7 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, 
{

    CPUHotplugState *cpu_st = opaque;

    AcpiCpuStatus *cdev;

    ACPIOSTInfo *info;



    assert(cpu_st->dev_count);
@@ -112,6 +147,28 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, 
            }

        }

        break;

    case ACPI_CPU_CMD_DATA_OFFSET_RW:

        switch (cpu_st->command) {

        case CPHP_OST_EVENT_CMD: {

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

           cdev->ost_event = data;

           trace_cpuhp_acpi_write_ost_ev(cpu_st->selector, cdev->ost_event);

           break;

        }

        case CPHP_OST_STATUS_CMD: {

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

           cdev->ost_status = data;

           info = acpi_cpu_device_status(cpu_st->selector, cdev);

           qapi_event_send_acpi_device_ost(info, &error_abort);

           qapi_free_ACPIOSTInfo(info);

           trace_cpuhp_acpi_write_ost_status(cpu_st->selector,

                                             cdev->ost_status);

           break;

        }

        default:

           break;

        }

        break;

    default:

        break;

    }
@@ -216,6 +273,8 @@ static const VMStateDescription vmstate_cpuhp_sts = { 
    .fields      = (VMStateField[]) {

        VMSTATE_BOOL(is_inserting, AcpiCpuStatus),

        VMSTATE_BOOL(is_removing, AcpiCpuStatus),

        VMSTATE_UINT32(ost_event, AcpiCpuStatus),

        VMSTATE_UINT32(ost_status, AcpiCpuStatus),

        VMSTATE_END_OF_LIST()

    }

};
@@ -241,6 +300,7 @@ const VMStateDescription vmstate_cpu_hotplug = { 
#define CPU_SCAN_METHOD   "CSCN"

#define CPU_NOTIFY_METHOD "CTFY"

#define CPU_EJECT_METHOD  "CEJ0"

#define CPU_OST_METHOD    "COST"



#define CPU_ENABLED       "CPEN"

#define CPU_SELECTOR      "CSEL"
@@ -416,6 +476,22 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
        }

        aml_append(cpus_dev, method);



        method = aml_method(CPU_OST_METHOD, 4, AML_SERIALIZED);

        {

            Aml *uid = aml_arg(0);

            Aml *ev_cmd = aml_int(CPHP_OST_EVENT_CMD);

            Aml *st_cmd = aml_int(CPHP_OST_STATUS_CMD);



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

            aml_append(method, aml_store(uid, cpu_selector));

            aml_append(method, aml_store(ev_cmd, cpu_cmd));

            aml_append(method, aml_store(aml_arg(1), cpu_data));

            aml_append(method, aml_store(st_cmd, cpu_cmd));

            aml_append(method, aml_store(aml_arg(2), cpu_data));

            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;
@@ -455,6 +531,12 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
            aml_append(method, aml_call1(CPU_EJECT_METHOD, uid));

            aml_append(dev, method);



            method = aml_method("_OST", 3, AML_SERIALIZED);

            aml_append(method,

                aml_call4(CPU_OST_METHOD, uid, aml_arg(0),

                          aml_arg(1), aml_arg(2))

            );

            aml_append(dev, method);

            aml_append(cpus_dev, dev);

        }

    }

hw/acpi/ich9.c

+3 −0
Original line number Diff line number Diff line
@@ -513,4 +513,7 @@ void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list) 
    ICH9LPCState *s = ICH9_LPC_DEVICE(adev);



    acpi_memory_ospm_status(&s->pm.acpi_memory_hotplug, list);

    if (!s->pm.cpu_hotplug_legacy) {

        acpi_cpu_ospm_status(&s->pm.cpuhp_state, list);

    }

}

hw/acpi/piix4.c

+3 −0
Original line number Diff line number Diff line
@@ -616,6 +616,9 @@ static void piix4_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list) 
    PIIX4PMState *s = PIIX4_PM(adev);



    acpi_memory_ospm_status(&s->acpi_memory_hotplug, list);

    if (!s->cpu_hotplug_legacy) {

        acpi_cpu_ospm_status(&s->cpuhp_state, list);

    }

}



static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)

hw/acpi/trace-events

+2 −0
Original line number Diff line number Diff line
@@ -28,3 +28,5 @@ cpuhp_acpi_clear_inserting_evt(uint32_t idx) "idx[0x%"PRIx32"]" 
cpuhp_acpi_clear_remove_evt(uint32_t idx) "idx[0x%"PRIx32"]"

cpuhp_acpi_ejecting_invalid_cpu(uint32_t idx) "0x%"PRIx32

cpuhp_acpi_ejecting_cpu(uint32_t idx) "0x%"PRIx32

cpuhp_acpi_write_ost_ev(uint32_t slot, uint32_t ev) "idx[0x%"PRIx32"] OST EVENT: 0x%"PRIx32

cpuhp_acpi_write_ost_status(uint32_t slot, uint32_t st) "idx[0x%"PRIx32"] OST STATUS: 0x%"PRIx32

include/hw/acpi/cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ typedef struct AcpiCpuStatus { 
    uint64_t arch_id;

    bool is_inserting;

    bool is_removing;

    uint32_t ost_event;

    uint32_t ost_status;

} AcpiCpuStatus;



typedef struct CPUHotplugState {
@@ -54,6 +56,8 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
                    const char *res_root,

                    const char *event_handler_method);



void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list);



extern const VMStateDescription vmstate_cpu_hotplug;

#define VMSTATE_CPU_HOTPLUG(cpuhp, state) \

    VMSTATE_STRUCT(cpuhp, state, 1, \