2016-06-14 17:02:06 +03:00
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "hw/boards.h"
|
2019-08-12 08:23:45 +03:00
|
|
|
#include "migration/vmstate.h"
|
2016-06-14 17:02:06 +03:00
|
|
|
#include "hw/acpi/cpu.h"
|
|
|
|
#include "qapi/error.h"
|
2020-09-13 22:53:47 +03:00
|
|
|
#include "qapi/qapi-events-acpi.h"
|
2016-06-14 17:02:06 +03:00
|
|
|
#include "trace.h"
|
2016-10-05 18:51:24 +03:00
|
|
|
#include "sysemu/numa.h"
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
#define ACPI_CPU_HOTPLUG_REG_LEN 12
|
|
|
|
#define ACPI_CPU_SELECTOR_OFFSET_WR 0
|
|
|
|
#define ACPI_CPU_FLAGS_OFFSET_RW 4
|
2016-06-14 17:13:32 +03:00
|
|
|
#define ACPI_CPU_CMD_OFFSET_WR 5
|
|
|
|
#define ACPI_CPU_CMD_DATA_OFFSET_RW 8
|
2019-12-09 16:09:00 +03:00
|
|
|
#define ACPI_CPU_CMD_DATA2_OFFSET_R 0
|
2016-06-14 17:13:32 +03:00
|
|
|
|
2020-09-23 12:46:48 +03:00
|
|
|
#define OVMF_CPUHP_SMI_CMD 4
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
enum {
|
|
|
|
CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0,
|
2016-04-22 20:06:36 +03:00
|
|
|
CPHP_OST_EVENT_CMD = 1,
|
|
|
|
CPHP_OST_STATUS_CMD = 2,
|
2019-12-09 16:09:02 +03:00
|
|
|
CPHP_GET_CPU_ID_CMD = 3,
|
2016-06-14 17:13:32 +03:00
|
|
|
CPHP_CMD_MAX
|
|
|
|
};
|
2016-06-14 17:02:06 +03:00
|
|
|
|
2016-04-22 20:06:36 +03:00
|
|
|
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)
|
|
|
|
{
|
2021-01-14 01:10:12 +03:00
|
|
|
ACPIOSTInfoList ***tail = list;
|
2016-04-22 20:06:36 +03:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < cpu_st->dev_count; i++) {
|
2021-01-14 01:10:12 +03:00
|
|
|
QAPI_LIST_APPEND(*tail, acpi_cpu_device_status(i, &cpu_st->devs[i]));
|
2016-04-22 20:06:36 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr, unsigned size)
|
|
|
|
{
|
|
|
|
uint64_t val = 0;
|
|
|
|
CPUHotplugState *cpu_st = opaque;
|
|
|
|
AcpiCpuStatus *cdev;
|
|
|
|
|
|
|
|
if (cpu_st->selector >= cpu_st->dev_count) {
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdev = &cpu_st->devs[cpu_st->selector];
|
|
|
|
switch (addr) {
|
|
|
|
case ACPI_CPU_FLAGS_OFFSET_RW: /* pack and return is_* fields */
|
|
|
|
val |= cdev->cpu ? 1 : 0;
|
2016-06-14 17:13:32 +03:00
|
|
|
val |= cdev->is_inserting ? 2 : 0;
|
2016-06-14 17:14:02 +03:00
|
|
|
val |= cdev->is_removing ? 4 : 0;
|
2020-12-07 17:07:33 +03:00
|
|
|
val |= cdev->fw_remove ? 16 : 0;
|
2016-06-14 17:02:06 +03:00
|
|
|
trace_cpuhp_acpi_read_flags(cpu_st->selector, val);
|
|
|
|
break;
|
2016-06-14 17:13:32 +03:00
|
|
|
case ACPI_CPU_CMD_DATA_OFFSET_RW:
|
|
|
|
switch (cpu_st->command) {
|
|
|
|
case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD:
|
|
|
|
val = cpu_st->selector;
|
|
|
|
break;
|
2019-12-09 16:09:02 +03:00
|
|
|
case CPHP_GET_CPU_ID_CMD:
|
|
|
|
val = cdev->arch_id & 0xFFFFFFFF;
|
|
|
|
break;
|
2016-06-14 17:13:32 +03:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
trace_cpuhp_acpi_read_cmd_data(cpu_st->selector, val);
|
|
|
|
break;
|
2019-12-09 16:09:00 +03:00
|
|
|
case ACPI_CPU_CMD_DATA2_OFFSET_R:
|
|
|
|
switch (cpu_st->command) {
|
|
|
|
case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD:
|
|
|
|
val = 0;
|
|
|
|
break;
|
2019-12-09 16:09:02 +03:00
|
|
|
case CPHP_GET_CPU_ID_CMD:
|
|
|
|
val = cdev->arch_id >> 32;
|
|
|
|
break;
|
2019-12-09 16:09:00 +03:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
trace_cpuhp_acpi_read_cmd_data2(cpu_st->selector, val);
|
|
|
|
break;
|
2016-06-14 17:02:06 +03:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data,
|
|
|
|
unsigned int size)
|
|
|
|
{
|
|
|
|
CPUHotplugState *cpu_st = opaque;
|
2016-06-14 17:13:32 +03:00
|
|
|
AcpiCpuStatus *cdev;
|
2016-04-22 20:06:36 +03:00
|
|
|
ACPIOSTInfo *info;
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
assert(cpu_st->dev_count);
|
|
|
|
|
|
|
|
if (addr) {
|
|
|
|
if (cpu_st->selector >= cpu_st->dev_count) {
|
|
|
|
trace_cpuhp_acpi_invalid_idx_selected(cpu_st->selector);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (addr) {
|
|
|
|
case ACPI_CPU_SELECTOR_OFFSET_WR: /* current CPU selector */
|
|
|
|
cpu_st->selector = data;
|
|
|
|
trace_cpuhp_acpi_write_idx(cpu_st->selector);
|
|
|
|
break;
|
2016-06-14 17:13:32 +03:00
|
|
|
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);
|
2016-06-14 17:14:02 +03:00
|
|
|
} else if (data & 4) { /* clear remove event */
|
|
|
|
cdev->is_removing = false;
|
|
|
|
trace_cpuhp_acpi_clear_remove_evt(cpu_st->selector);
|
|
|
|
} else if (data & 8) {
|
|
|
|
DeviceState *dev = NULL;
|
|
|
|
HotplugHandler *hotplug_ctrl = NULL;
|
|
|
|
|
2018-08-27 14:07:10 +03:00
|
|
|
if (!cdev->cpu || cdev->cpu == first_cpu) {
|
2016-06-14 17:14:02 +03:00
|
|
|
trace_cpuhp_acpi_ejecting_invalid_cpu(cpu_st->selector);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
trace_cpuhp_acpi_ejecting_cpu(cpu_st->selector);
|
|
|
|
dev = DEVICE(cdev->cpu);
|
|
|
|
hotplug_ctrl = qdev_get_hotplug_handler(dev);
|
|
|
|
hotplug_handler_unplug(hotplug_ctrl, dev, NULL);
|
qdev: Let the hotplug_handler_unplug() caller delete the device
When unplugging a device, at one point the device will be destroyed
via object_unparent(). This will, one the one hand, unrealize the
removed device hierarchy, and on the other hand, destroy/free the
device hierarchy.
When chaining hotplug handlers, we want to overwrite a bus hotplug
handler by the machine hotplug handler, to be able to perform
some part of the plug/unplug and to forward the calls to the bus hotplug
handler.
For now, the bus hotplug handler would trigger an object_unparent(), not
allowing us to perform some unplug action on a device after we forwarded
the call to the bus hotplug handler. The device would be gone at that
point.
machine_unplug_handler(dev)
/* eventually do unplug stuff */
bus_unplug_handler(dev)
/* dev is gone, we can't do more unplug stuff */
So move the object_unparent() to the original caller of the unplug. For
now, keep the unrealize() at the original places of the
object_unparent(). For implicitly chained hotplug handlers (e.g. pc
code calling acpi hotplug handlers), the object_unparent() has to be
done by the outermost caller. So when calling hotplug_handler_unplug()
from inside an unplug handler, nothing is to be done.
hotplug_handler_unplug(dev) -> calls machine_unplug_handler()
machine_unplug_handler(dev) {
/* eventually do unplug stuff */
bus_unplug_handler(dev) -> calls unrealize(dev)
/* we can do more unplug stuff but device already unrealized */
}
object_unparent(dev)
In the long run, every unplug action should be factored out of the
unrealize() function into the unplug handler (especially for PCI). Then
we can get rid of the additonal unrealize() calls and object_unparent()
will properly unrealize the device hierarchy after the device has been
unplugged.
hotplug_handler_unplug(dev) -> calls machine_unplug_handler()
machine_unplug_handler(dev) {
/* eventually do unplug stuff */
bus_unplug_handler(dev) -> only unplugs, does not unrealize
/* we can do more unplug stuff */
}
object_unparent(dev) -> will unrealize
The original approach was suggested by Igor Mammedov for the PCI
part, but I extended it to all hotplug handlers. I consider this one
step into the right direction.
To summarize:
- object_unparent() on synchronous unplugs is done by common code
-- "Caller of hotplug_handler_unplug"
- object_unparent() on asynchronous unplugs ("unplug requests") has to
be done manually
-- "Caller of hotplug_handler_unplug"
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190228122849.4296-2-david@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-02-28 15:28:47 +03:00
|
|
|
object_unparent(OBJECT(dev));
|
2020-12-07 17:07:33 +03:00
|
|
|
cdev->fw_remove = false;
|
|
|
|
} else if (data & 16) {
|
|
|
|
if (!cdev->cpu || cdev->cpu == first_cpu) {
|
|
|
|
trace_cpuhp_acpi_fw_remove_invalid_cpu(cpu_st->selector);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
trace_cpuhp_acpi_fw_remove_cpu(cpu_st->selector);
|
|
|
|
cdev->fw_remove = true;
|
2016-06-14 17:13:32 +03:00
|
|
|
}
|
|
|
|
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];
|
2020-12-07 17:07:33 +03:00
|
|
|
if (cdev->is_inserting || cdev->is_removing ||
|
|
|
|
cdev->fw_remove) {
|
2016-06-14 17:13:32 +03:00
|
|
|
cpu_st->selector = iter;
|
|
|
|
trace_cpuhp_acpi_cpu_has_events(cpu_st->selector,
|
2016-06-14 17:14:02 +03:00
|
|
|
cdev->is_inserting, cdev->is_removing);
|
2016-06-14 17:13:32 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
iter = iter + 1 < cpu_st->dev_count ? iter + 1 : 0;
|
|
|
|
} while (iter != cpu_st->selector);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2016-04-22 20:06:36 +03:00
|
|
|
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);
|
2018-08-15 16:37:37 +03:00
|
|
|
qapi_event_send_acpi_device_ost(info);
|
2016-04-22 20:06:36 +03:00
|
|
|
qapi_free_ACPIOSTInfo(info);
|
|
|
|
trace_cpuhp_acpi_write_ost_status(cpu_st->selector,
|
|
|
|
cdev->ost_status);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2016-06-14 17:02:06 +03:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const MemoryRegionOps cpu_hotplug_ops = {
|
|
|
|
.read = cpu_hotplug_rd,
|
|
|
|
.write = cpu_hotplug_wr,
|
|
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
|
|
.valid = {
|
|
|
|
.min_access_size = 1,
|
|
|
|
.max_access_size = 4,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
|
|
|
|
CPUHotplugState *state, hwaddr base_addr)
|
|
|
|
{
|
|
|
|
MachineState *machine = MACHINE(qdev_get_machine());
|
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2017-01-18 20:13:20 +03:00
|
|
|
const CPUArchIdList *id_list;
|
2016-06-14 17:02:06 +03:00
|
|
|
int i;
|
|
|
|
|
|
|
|
assert(mc->possible_cpu_arch_ids);
|
|
|
|
id_list = mc->possible_cpu_arch_ids(machine);
|
|
|
|
state->dev_count = id_list->len;
|
|
|
|
state->devs = g_new0(typeof(*state->devs), state->dev_count);
|
|
|
|
for (i = 0; i < id_list->len; i++) {
|
2017-02-09 14:08:36 +03:00
|
|
|
state->devs[i].cpu = CPU(id_list->cpus[i].cpu);
|
2016-06-14 17:02:06 +03:00
|
|
|
state->devs[i].arch_id = id_list->cpus[i].arch_id;
|
|
|
|
}
|
|
|
|
memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state,
|
2020-04-13 12:15:52 +03:00
|
|
|
"acpi-cpu-hotplug", ACPI_CPU_HOTPLUG_REG_LEN);
|
2016-06-14 17:02:06 +03:00
|
|
|
memory_region_add_subregion(as, base_addr, &state->ctrl_reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static AcpiCpuStatus *get_cpu_status(CPUHotplugState *cpu_st, DeviceState *dev)
|
|
|
|
{
|
|
|
|
CPUClass *k = CPU_GET_CLASS(dev);
|
|
|
|
uint64_t cpu_arch_id = k->get_arch_id(CPU(dev));
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < cpu_st->dev_count; i++) {
|
|
|
|
if (cpu_arch_id == cpu_st->devs[i].arch_id) {
|
|
|
|
return &cpu_st->devs[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void acpi_cpu_plug_cb(HotplugHandler *hotplug_dev,
|
|
|
|
CPUHotplugState *cpu_st, DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
AcpiCpuStatus *cdev;
|
|
|
|
|
|
|
|
cdev = get_cpu_status(cpu_st, dev);
|
|
|
|
if (!cdev) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdev->cpu = CPU(dev);
|
2016-06-14 17:13:32 +03:00
|
|
|
if (dev->hotplugged) {
|
|
|
|
cdev->is_inserting = true;
|
|
|
|
acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS);
|
|
|
|
}
|
2016-06-14 17:02:06 +03:00
|
|
|
}
|
|
|
|
|
2016-06-14 17:14:02 +03:00
|
|
|
void acpi_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
|
|
CPUHotplugState *cpu_st,
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
AcpiCpuStatus *cdev;
|
|
|
|
|
|
|
|
cdev = get_cpu_status(cpu_st, dev);
|
|
|
|
if (!cdev) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdev->is_removing = true;
|
|
|
|
acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS);
|
|
|
|
}
|
|
|
|
|
|
|
|
void acpi_cpu_unplug_cb(CPUHotplugState *cpu_st,
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
AcpiCpuStatus *cdev;
|
|
|
|
|
|
|
|
cdev = get_cpu_status(cpu_st, dev);
|
|
|
|
if (!cdev) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cdev->cpu = NULL;
|
|
|
|
}
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
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),
|
2016-06-14 17:14:02 +03:00
|
|
|
VMSTATE_BOOL(is_removing, AcpiCpuStatus),
|
2016-04-22 20:06:36 +03:00
|
|
|
VMSTATE_UINT32(ost_event, AcpiCpuStatus),
|
|
|
|
VMSTATE_UINT32(ost_status, AcpiCpuStatus),
|
2016-06-14 17:13:32 +03:00
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
const VMStateDescription vmstate_cpu_hotplug = {
|
|
|
|
.name = "CPU hotplug state",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.minimum_version_id_old = 1,
|
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_UINT32(selector, CPUHotplugState),
|
2016-06-14 17:13:32 +03:00
|
|
|
VMSTATE_UINT8(command, CPUHotplugState),
|
|
|
|
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, CPUHotplugState, dev_count,
|
|
|
|
vmstate_cpuhp_sts, AcpiCpuStatus),
|
2016-06-14 17:02:06 +03:00
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
#define CPU_NAME_FMT "C%.03X"
|
|
|
|
#define CPUHP_RES_DEVICE "PRES"
|
|
|
|
#define CPU_LOCK "CPLK"
|
|
|
|
#define CPU_STS_METHOD "CSTA"
|
2016-06-14 17:13:32 +03:00
|
|
|
#define CPU_SCAN_METHOD "CSCN"
|
|
|
|
#define CPU_NOTIFY_METHOD "CTFY"
|
2016-06-14 17:14:02 +03:00
|
|
|
#define CPU_EJECT_METHOD "CEJ0"
|
2016-04-22 20:06:36 +03:00
|
|
|
#define CPU_OST_METHOD "COST"
|
2020-09-23 12:46:48 +03:00
|
|
|
#define CPU_ADDED_LIST "CNEW"
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
#define CPU_ENABLED "CPEN"
|
|
|
|
#define CPU_SELECTOR "CSEL"
|
2016-06-14 17:13:32 +03:00
|
|
|
#define CPU_COMMAND "CCMD"
|
|
|
|
#define CPU_DATA "CDAT"
|
|
|
|
#define CPU_INSERT_EVENT "CINS"
|
2016-06-14 17:14:02 +03:00
|
|
|
#define CPU_REMOVE_EVENT "CRMV"
|
|
|
|
#define CPU_EJECT_EVENT "CEJ0"
|
2020-12-07 17:07:36 +03:00
|
|
|
#define CPU_FW_EJECT_EVENT "CEJF"
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
|
|
|
|
hwaddr io_base,
|
2016-06-14 17:13:32 +03:00
|
|
|
const char *res_root,
|
|
|
|
const char *event_handler_method)
|
2016-06-14 17:02:06 +03:00
|
|
|
{
|
|
|
|
Aml *ifctx;
|
|
|
|
Aml *field;
|
|
|
|
Aml *method;
|
|
|
|
Aml *cpu_ctrl_dev;
|
|
|
|
Aml *cpus_dev;
|
|
|
|
Aml *zero = aml_int(0);
|
|
|
|
Aml *one = aml_int(1);
|
|
|
|
Aml *sb_scope = aml_scope("_SB");
|
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2017-01-18 20:13:20 +03:00
|
|
|
const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);
|
2016-06-14 17:02:06 +03:00
|
|
|
char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root);
|
2016-06-14 17:13:32 +03:00
|
|
|
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);
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
cpu_ctrl_dev = aml_device("%s", cphp_res_path);
|
|
|
|
{
|
|
|
|
Aml *crs;
|
|
|
|
|
|
|
|
aml_append(cpu_ctrl_dev,
|
|
|
|
aml_name_decl("_HID", aml_eisaid("PNP0A06")));
|
|
|
|
aml_append(cpu_ctrl_dev,
|
|
|
|
aml_name_decl("_UID", aml_string("CPU Hotplug resources")));
|
|
|
|
aml_append(cpu_ctrl_dev, aml_mutex(CPU_LOCK, 0));
|
|
|
|
|
|
|
|
crs = aml_resource_template();
|
|
|
|
aml_append(crs, aml_io(AML_DECODE16, io_base, io_base, 1,
|
|
|
|
ACPI_CPU_HOTPLUG_REG_LEN));
|
|
|
|
aml_append(cpu_ctrl_dev, aml_name_decl("_CRS", crs));
|
|
|
|
|
|
|
|
/* declare CPU hotplug MMIO region with related access fields */
|
|
|
|
aml_append(cpu_ctrl_dev,
|
|
|
|
aml_operation_region("PRST", AML_SYSTEM_IO, aml_int(io_base),
|
|
|
|
ACPI_CPU_HOTPLUG_REG_LEN));
|
|
|
|
|
|
|
|
field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK,
|
|
|
|
AML_WRITE_AS_ZEROS);
|
|
|
|
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));
|
2016-06-14 17:13:32 +03:00
|
|
|
/* (read) 1 if has a insert event. (write) 1 to clear event */
|
|
|
|
aml_append(field, aml_named_field(CPU_INSERT_EVENT, 1));
|
2016-06-14 17:14:02 +03:00
|
|
|
/* (read) 1 if has a remove event. (write) 1 to clear event */
|
|
|
|
aml_append(field, aml_named_field(CPU_REMOVE_EVENT, 1));
|
|
|
|
/* initiates device eject, write only */
|
|
|
|
aml_append(field, aml_named_field(CPU_EJECT_EVENT, 1));
|
2020-12-07 17:07:36 +03:00
|
|
|
/* tell firmware to do device eject, write only */
|
|
|
|
aml_append(field, aml_named_field(CPU_FW_EJECT_EVENT, 1));
|
|
|
|
aml_append(field, aml_reserved_field(3));
|
2016-06-14 17:13:32 +03:00
|
|
|
aml_append(field, aml_named_field(CPU_COMMAND, 8));
|
2016-06-14 17:02:06 +03:00
|
|
|
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));
|
2016-06-14 17:13:32 +03:00
|
|
|
/* flags + cmd + 2byte align */
|
|
|
|
aml_append(field, aml_reserved_field(4 * 8));
|
|
|
|
aml_append(field, aml_named_field(CPU_DATA, 32));
|
2016-06-14 17:02:06 +03:00
|
|
|
aml_append(cpu_ctrl_dev, field);
|
|
|
|
|
2016-06-15 12:25:23 +03:00
|
|
|
if (opts.has_legacy_cphp) {
|
|
|
|
method = aml_method("_INI", 0, AML_SERIALIZED);
|
|
|
|
/* switch off legacy CPU hotplug HW and use new one,
|
|
|
|
* on reboot system is in new mode and writing 0
|
|
|
|
* in CPU_SELECTOR selects BSP, which is NOP at
|
|
|
|
* the time _INI is called */
|
|
|
|
aml_append(method, aml_store(zero, aml_name(CPU_SELECTOR)));
|
|
|
|
aml_append(cpu_ctrl_dev, method);
|
|
|
|
}
|
2016-06-14 17:02:06 +03:00
|
|
|
}
|
|
|
|
aml_append(sb_scope, cpu_ctrl_dev);
|
|
|
|
|
|
|
|
cpus_dev = aml_device("\\_SB.CPUS");
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
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);
|
2016-06-14 17:13:32 +03:00
|
|
|
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);
|
2016-06-14 17:14:02 +03:00
|
|
|
Aml *rm_evt = aml_name("%s.%s", cphp_res_path, CPU_REMOVE_EVENT);
|
|
|
|
Aml *ej_evt = aml_name("%s.%s", cphp_res_path, CPU_EJECT_EVENT);
|
2020-12-07 17:07:36 +03:00
|
|
|
Aml *fw_ej_evt = aml_name("%s.%s", cphp_res_path, CPU_FW_EJECT_EVENT);
|
2016-06-14 17:02:06 +03:00
|
|
|
|
|
|
|
aml_append(cpus_dev, aml_name_decl("_HID", aml_string("ACPI0010")));
|
|
|
|
aml_append(cpus_dev, aml_name_decl("_CID", aml_eisaid("PNP0A05")));
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
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);
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
method = aml_method(CPU_STS_METHOD, 1, AML_SERIALIZED);
|
|
|
|
{
|
|
|
|
Aml *idx = aml_arg(0);
|
|
|
|
Aml *sta = aml_local(0);
|
|
|
|
|
|
|
|
aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
|
|
|
|
aml_append(method, aml_store(idx, cpu_selector));
|
|
|
|
aml_append(method, aml_store(zero, sta));
|
|
|
|
ifctx = aml_if(aml_equal(is_enabled, one));
|
|
|
|
{
|
|
|
|
aml_append(ifctx, aml_store(aml_int(0xF), sta));
|
|
|
|
}
|
|
|
|
aml_append(method, ifctx);
|
|
|
|
aml_append(method, aml_release(ctrl_lock));
|
|
|
|
aml_append(method, aml_return(sta));
|
|
|
|
}
|
|
|
|
aml_append(cpus_dev, method);
|
|
|
|
|
2016-06-14 17:14:02 +03:00
|
|
|
method = aml_method(CPU_EJECT_METHOD, 1, AML_SERIALIZED);
|
|
|
|
{
|
|
|
|
Aml *idx = aml_arg(0);
|
|
|
|
|
|
|
|
aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
|
|
|
|
aml_append(method, aml_store(idx, cpu_selector));
|
2020-12-07 17:07:36 +03:00
|
|
|
if (opts.fw_unplugs_cpu) {
|
|
|
|
aml_append(method, aml_store(one, fw_ej_evt));
|
|
|
|
aml_append(method, aml_store(aml_int(OVMF_CPUHP_SMI_CMD),
|
|
|
|
aml_name("%s", opts.smi_path)));
|
|
|
|
} else {
|
|
|
|
aml_append(method, aml_store(one, ej_evt));
|
|
|
|
}
|
2016-06-14 17:14:02 +03:00
|
|
|
aml_append(method, aml_release(ctrl_lock));
|
|
|
|
}
|
|
|
|
aml_append(cpus_dev, method);
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
method = aml_method(CPU_SCAN_METHOD, 0, AML_SERIALIZED);
|
|
|
|
{
|
2020-09-23 12:46:48 +03:00
|
|
|
const uint8_t max_cpus_per_pass = 255;
|
2016-06-14 17:14:02 +03:00
|
|
|
Aml *else_ctx;
|
2020-09-23 12:46:48 +03:00
|
|
|
Aml *while_ctx, *while_ctx2;
|
2016-06-14 17:13:32 +03:00
|
|
|
Aml *has_event = aml_local(0);
|
|
|
|
Aml *dev_chk = aml_int(1);
|
2016-06-14 17:14:02 +03:00
|
|
|
Aml *eject_req = aml_int(3);
|
2016-06-14 17:13:32 +03:00
|
|
|
Aml *next_cpu_cmd = aml_int(CPHP_GET_NEXT_CPU_WITH_EVENT_CMD);
|
2020-09-23 12:46:48 +03:00
|
|
|
Aml *num_added_cpus = aml_local(1);
|
|
|
|
Aml *cpu_idx = aml_local(2);
|
|
|
|
Aml *uid = aml_local(3);
|
|
|
|
Aml *has_job = aml_local(4);
|
|
|
|
Aml *new_cpus = aml_name(CPU_ADDED_LIST);
|
2016-06-14 17:13:32 +03:00
|
|
|
|
|
|
|
aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
|
2020-09-23 12:46:48 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Windows versions newer than XP (including Windows 10/Windows
|
|
|
|
* Server 2019), do support* VarPackageOp but, it is cripled to hold
|
|
|
|
* the same elements number as old PackageOp.
|
|
|
|
* For compatibility with Windows XP (so it won't crash) use ACPI1.0
|
|
|
|
* PackageOp which can hold max 255 elements.
|
|
|
|
*
|
|
|
|
* use named package as old Windows don't support it in local var
|
|
|
|
*/
|
|
|
|
aml_append(method, aml_name_decl(CPU_ADDED_LIST,
|
|
|
|
aml_package(max_cpus_per_pass)));
|
|
|
|
|
|
|
|
aml_append(method, aml_store(zero, uid));
|
|
|
|
aml_append(method, aml_store(one, has_job));
|
|
|
|
/*
|
|
|
|
* CPU_ADDED_LIST can hold limited number of elements, outer loop
|
|
|
|
* allows to process CPUs in batches which let us to handle more
|
|
|
|
* CPUs than CPU_ADDED_LIST can hold.
|
|
|
|
*/
|
|
|
|
while_ctx2 = aml_while(aml_equal(has_job, one));
|
2016-06-14 17:13:32 +03:00
|
|
|
{
|
2020-09-23 12:46:48 +03:00
|
|
|
aml_append(while_ctx2, aml_store(zero, has_job));
|
|
|
|
|
|
|
|
aml_append(while_ctx2, aml_store(one, has_event));
|
|
|
|
aml_append(while_ctx2, aml_store(zero, num_added_cpus));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan CPUs, till there are CPUs with events or
|
|
|
|
* CPU_ADDED_LIST capacity is exhausted
|
|
|
|
*/
|
|
|
|
while_ctx = aml_while(aml_land(aml_equal(has_event, one),
|
|
|
|
aml_lless(uid, aml_int(arch_ids->len))));
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* clear loop exit condition, ins_evt/rm_evt checks 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(uid, cpu_selector));
|
|
|
|
aml_append(while_ctx, aml_store(next_cpu_cmd, cpu_cmd));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wrap around case, scan is complete, exit loop.
|
|
|
|
* It happens since events are not cleared in scan loop,
|
|
|
|
* so next_cpu_cmd continues to find already processed CPUs
|
|
|
|
*/
|
|
|
|
ifctx = aml_if(aml_lless(cpu_data, uid));
|
|
|
|
{
|
|
|
|
aml_append(ifctx, aml_break());
|
|
|
|
}
|
|
|
|
aml_append(while_ctx, ifctx);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if CPU_ADDED_LIST is full, exit inner loop and process
|
|
|
|
* collected CPUs
|
|
|
|
*/
|
|
|
|
ifctx = aml_if(
|
|
|
|
aml_equal(num_added_cpus, aml_int(max_cpus_per_pass)));
|
|
|
|
{
|
|
|
|
aml_append(ifctx, aml_store(one, has_job));
|
|
|
|
aml_append(ifctx, aml_break());
|
|
|
|
}
|
|
|
|
aml_append(while_ctx, ifctx);
|
|
|
|
|
|
|
|
aml_append(while_ctx, aml_store(cpu_data, uid));
|
|
|
|
ifctx = aml_if(aml_equal(ins_evt, one));
|
|
|
|
{
|
|
|
|
/* cache added CPUs to Notify/Wakeup later */
|
|
|
|
aml_append(ifctx, aml_store(uid,
|
|
|
|
aml_index(new_cpus, num_added_cpus)));
|
|
|
|
aml_append(ifctx, aml_increment(num_added_cpus));
|
|
|
|
aml_append(ifctx, aml_store(one, has_event));
|
|
|
|
}
|
|
|
|
aml_append(while_ctx, ifctx);
|
|
|
|
else_ctx = aml_else();
|
|
|
|
ifctx = aml_if(aml_equal(rm_evt, one));
|
|
|
|
{
|
|
|
|
aml_append(ifctx,
|
|
|
|
aml_call2(CPU_NOTIFY_METHOD, uid, eject_req));
|
|
|
|
aml_append(ifctx, aml_store(one, rm_evt));
|
|
|
|
aml_append(ifctx, aml_store(one, has_event));
|
|
|
|
}
|
|
|
|
aml_append(else_ctx, ifctx);
|
|
|
|
aml_append(while_ctx, else_ctx);
|
|
|
|
aml_append(while_ctx, aml_increment(uid));
|
|
|
|
}
|
|
|
|
aml_append(while_ctx2, while_ctx);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* in case FW negotiated ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT,
|
|
|
|
* make upcall to FW, so it can pull in new CPUs before
|
|
|
|
* OS is notified and wakes them up
|
|
|
|
*/
|
|
|
|
if (opts.smi_path) {
|
|
|
|
ifctx = aml_if(aml_lgreater(num_added_cpus, zero));
|
|
|
|
{
|
|
|
|
aml_append(ifctx, aml_store(aml_int(OVMF_CPUHP_SMI_CMD),
|
|
|
|
aml_name("%s", opts.smi_path)));
|
|
|
|
}
|
|
|
|
aml_append(while_ctx2, ifctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Notify OSPM about new CPUs and clear insert events */
|
|
|
|
aml_append(while_ctx2, aml_store(zero, cpu_idx));
|
|
|
|
while_ctx = aml_while(aml_lless(cpu_idx, num_added_cpus));
|
|
|
|
{
|
|
|
|
aml_append(while_ctx,
|
|
|
|
aml_store(aml_derefof(aml_index(new_cpus, cpu_idx)),
|
|
|
|
uid));
|
|
|
|
aml_append(while_ctx,
|
|
|
|
aml_call2(CPU_NOTIFY_METHOD, uid, dev_chk));
|
|
|
|
aml_append(while_ctx, aml_store(uid, aml_debug()));
|
|
|
|
aml_append(while_ctx, aml_store(uid, cpu_selector));
|
|
|
|
aml_append(while_ctx, aml_store(one, ins_evt));
|
|
|
|
aml_append(while_ctx, aml_increment(cpu_idx));
|
|
|
|
}
|
|
|
|
aml_append(while_ctx2, while_ctx);
|
|
|
|
/*
|
|
|
|
* If another batch is needed, then it will resume scanning
|
|
|
|
* exactly at -- and not after -- the last CPU that's currently
|
|
|
|
* in CPU_ADDED_LIST. In other words, the last CPU in
|
|
|
|
* CPU_ADDED_LIST is going to be re-checked. That's OK: we've
|
|
|
|
* just cleared the insert event for *all* CPUs in
|
|
|
|
* CPU_ADDED_LIST, including the last one. So the scan will
|
|
|
|
* simply seek past it.
|
|
|
|
*/
|
2016-06-14 17:13:32 +03:00
|
|
|
}
|
2020-09-23 12:46:48 +03:00
|
|
|
aml_append(method, while_ctx2);
|
2016-06-14 17:13:32 +03:00
|
|
|
aml_append(method, aml_release(ctrl_lock));
|
|
|
|
}
|
|
|
|
aml_append(cpus_dev, method);
|
|
|
|
|
2016-04-22 20:06:36 +03:00
|
|
|
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);
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
/* build Processor object for each processor */
|
|
|
|
for (i = 0; i < arch_ids->len; i++) {
|
|
|
|
Aml *dev;
|
|
|
|
Aml *uid = aml_int(i);
|
2016-06-14 17:13:32 +03:00
|
|
|
GArray *madt_buf = g_array_new(0, 1, 1);
|
2016-06-14 17:02:06 +03:00
|
|
|
int arch_id = arch_ids->cpus[i].arch_id;
|
|
|
|
|
2019-01-25 12:40:46 +03:00
|
|
|
if (opts.acpi_1_compatible && arch_id < 255) {
|
2016-06-14 17:02:06 +03:00
|
|
|
dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i);
|
|
|
|
} else {
|
|
|
|
dev = aml_device(CPU_NAME_FMT, i);
|
|
|
|
aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0007")));
|
|
|
|
aml_append(dev, aml_name_decl("_UID", uid));
|
|
|
|
}
|
|
|
|
|
|
|
|
method = aml_method("_STA", 0, AML_SERIALIZED);
|
|
|
|
aml_append(method, aml_return(aml_call1(CPU_STS_METHOD, uid)));
|
|
|
|
aml_append(dev, method);
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
/* 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;
|
|
|
|
}
|
2016-10-19 15:05:31 +03:00
|
|
|
case ACPI_APIC_LOCAL_X2APIC: {
|
|
|
|
AcpiMadtProcessorX2Apic *apic = (void *)madt_buf->data;
|
|
|
|
apic->flags = cpu_to_le32(1);
|
|
|
|
break;
|
|
|
|
}
|
2016-06-14 17:13:32 +03:00
|
|
|
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);
|
|
|
|
|
2018-08-27 14:07:10 +03:00
|
|
|
if (CPU(arch_ids->cpus[i].cpu) != first_cpu) {
|
|
|
|
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
|
|
|
|
aml_append(method, aml_call1(CPU_EJECT_METHOD, uid));
|
|
|
|
aml_append(dev, method);
|
|
|
|
}
|
2016-06-14 17:14:02 +03:00
|
|
|
|
2016-04-22 20:06:36 +03:00
|
|
|
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);
|
2016-10-05 18:51:24 +03:00
|
|
|
|
|
|
|
/* Linux guests discard SRAT info for non-present CPUs
|
|
|
|
* as a result _PXM is required for all CPUs which might
|
|
|
|
* be hot-plugged. For simplicity, add it for all CPUs.
|
|
|
|
*/
|
2017-05-10 14:29:52 +03:00
|
|
|
if (arch_ids->cpus[i].props.has_node_id) {
|
|
|
|
aml_append(dev, aml_name_decl("_PXM",
|
|
|
|
aml_int(arch_ids->cpus[i].props.node_id)));
|
2016-10-05 18:51:24 +03:00
|
|
|
}
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
aml_append(cpus_dev, dev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
aml_append(sb_scope, cpus_dev);
|
|
|
|
aml_append(table, sb_scope);
|
|
|
|
|
2016-06-14 17:13:32 +03:00
|
|
|
method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
|
|
|
|
aml_append(method, aml_call0("\\_SB.CPUS." CPU_SCAN_METHOD));
|
|
|
|
aml_append(table, method);
|
|
|
|
|
2016-06-14 17:02:06 +03:00
|
|
|
g_free(cphp_res_path);
|
|
|
|
}
|