[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 08/17] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 08/17] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command |
Date: |
Wed, 22 Jan 2020 01:50:11 -0500 |
From: Igor Mammedov <address@hidden>
Firmware can enumerate present at boot APs by broadcasting wakeup IPI,
so that woken up secondary CPUs could register them-selves.
However in CPU hotplug case, it would need to know architecture
specific CPU IDs for possible and hotplugged CPUs so it could
prepare environment for and wake hotplugged AP.
Reuse and extend existing CPU hotplug interface to return architecture
specific ID for currently selected CPU in 2 registers:
- lower 32 bits in ACPI_CPU_CMD_DATA_OFFSET_RW
- upper 32 bits in ACPI_CPU_CMD_DATA2_OFFSET_R
On x86, firmware will use CPHP_GET_CPU_ID_CMD for fetching the APIC ID
when handling hotplug SMI.
Later, CPHP_GET_CPU_ID_CMD will be used on ARM to retrieve MPIDR,
which serves the similar to APIC ID purpose.
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
docs/specs/acpi_cpu_hotplug.txt | 3 +++
hw/acpi/cpu.c | 7 +++++++
2 files changed, 10 insertions(+)
diff --git a/docs/specs/acpi_cpu_hotplug.txt b/docs/specs/acpi_cpu_hotplug.txt
index cb99cf3c8e..a8ce5e7402 100644
--- a/docs/specs/acpi_cpu_hotplug.txt
+++ b/docs/specs/acpi_cpu_hotplug.txt
@@ -47,6 +47,7 @@ read access:
[0x0-0x3] Command data 2: (DWORD access)
if value last stored in 'Command field':
0: reads as 0x0
+ 3: upper 32 bits of architecture specific CPU ID value
other values: reserved
[0x4] CPU device status fields: (1 byte access)
bits:
@@ -61,6 +62,8 @@ read access:
[0x8] Command data: (DWORD access)
contains 0 unless value last stored in 'Command field' is one of:
0: contains 'CPU selector' value of a CPU with pending event[s]
+ 3: lower 32 bits of architecture specific CPU ID value
+ (in x86 case: APIC ID)
write access:
offset:
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index d475c06953..e2c957ce00 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -18,6 +18,7 @@ enum {
CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0,
CPHP_OST_EVENT_CMD = 1,
CPHP_OST_STATUS_CMD = 2,
+ CPHP_GET_CPU_ID_CMD = 3,
CPHP_CMD_MAX
};
@@ -75,6 +76,9 @@ static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr,
unsigned size)
case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD:
val = cpu_st->selector;
break;
+ case CPHP_GET_CPU_ID_CMD:
+ val = cdev->arch_id & 0xFFFFFFFF;
+ break;
default:
break;
}
@@ -85,6 +89,9 @@ static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr,
unsigned size)
case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD:
val = 0;
break;
+ case CPHP_GET_CPU_ID_CMD:
+ val = cdev->arch_id >> 32;
+ break;
default:
break;
}
--
MST
- [PULL v2 00/17] virtio, pc: fixes, features, Michael S. Tsirkin, 2020/01/22
- [PULL v2 01/17] q35: implement 128K SMRAM at default SMBASE address, Michael S. Tsirkin, 2020/01/22
- [PULL v2 02/17] tests: q35: MCH: add default SMBASE SMRAM lock test, Michael S. Tsirkin, 2020/01/22
- [PULL v2 03/17] acpi: cpuhp: spec: clarify 'CPU selector' register usage and endianness, Michael S. Tsirkin, 2020/01/22
- [PULL v2 04/17] acpi: cpuhp: spec: fix 'Command data' description, Michael S. Tsirkin, 2020/01/22
- [PULL v2 05/17] acpi: cpuhp: spec: clarify store into 'Command data' when 'Command field' == 0, Michael S. Tsirkin, 2020/01/22
- [PULL v2 06/17] acpi: cpuhp: introduce 'Command data 2' field, Michael S. Tsirkin, 2020/01/22
- [PULL v2 07/17] acpi: cpuhp: spec: add typical usecases, Michael S. Tsirkin, 2020/01/22
- [PULL v2 08/17] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command,
Michael S. Tsirkin <=
- [PULL v2 09/17] bios-tables-test: document expected file update, Michael S. Tsirkin, 2020/01/22
- [PULL v2 10/17] virtio-9p-device: fix memleak in virtio_9p_device_unrealize, Michael S. Tsirkin, 2020/01/22
- [PULL v2 12/17] virtio-scsi: delete vqs in unrealize to avoid memleaks, Michael S. Tsirkin, 2020/01/22
- [PULL v2 11/17] virtio-9p-device: convert to new virtio_delete_queue, Michael S. Tsirkin, 2020/01/22
- [PULL v2 13/17] virtio-scsi: convert to new virtio_delete_queue, Michael S. Tsirkin, 2020/01/22
- [PULL v2 14/17] vhost-vsock: delete vqs in vhost_vsock_unrealize to avoid memleaks, Michael S. Tsirkin, 2020/01/22
- [PULL v2 15/17] vhost: Add names to section rounded warning, Michael S. Tsirkin, 2020/01/22
- [PULL v2 16/17] vhost: Only align sections for vhost-user, Michael S. Tsirkin, 2020/01/22
- [PULL v2 17/17] i386:acpi: Remove _HID from the SMBus ACPI entry, Michael S. Tsirkin, 2020/01/22
- Re: [PULL v2 00/17] virtio, pc: fixes, features, no-reply, 2020/01/22