mirror of https://github.com/proxmox/mirror_qemu
acpi: create acpi-common.c and move madt code
We'll need madt support for microvm. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20200520132003.9492-7-kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>master
Gerd Hoffmann
Michael S. Tsirkin
parent
1dc32f9aeb
commit
eb66ffabc0
|
|
@ -16,4 +16,5 @@ obj-$(CONFIG_VMMOUSE) += vmmouse.o
|
|||
obj-$(CONFIG_PC) += port92.o
|
||||
|
||||
obj-y += kvmvapic.o
|
||||
obj-$(CONFIG_ACPI) += acpi-common.o
|
||||
obj-$(CONFIG_PC) += acpi-build.o
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "acpi-build.h"
|
||||
#include "acpi-common.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/pci/pci.h"
|
||||
|
|
@ -89,9 +90,6 @@
|
|||
#define ACPI_BUILD_DPRINTF(fmt, ...)
|
||||
#endif
|
||||
|
||||
/* Default IOAPIC ID */
|
||||
#define ACPI_BUILD_IOAPIC_ID 0x0
|
||||
|
||||
typedef struct AcpiPmInfo {
|
||||
bool s3_disabled;
|
||||
bool s4_disabled;
|
||||
|
|
@ -327,124 +325,6 @@ build_facs(GArray *table_data)
|
|||
facs->length = cpu_to_le32(sizeof(*facs));
|
||||
}
|
||||
|
||||
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
|
||||
const CPUArchIdList *apic_ids, GArray *entry)
|
||||
{
|
||||
uint32_t apic_id = apic_ids->cpus[uid].arch_id;
|
||||
|
||||
/* ACPI spec says that LAPIC entry for non present
|
||||
* CPU may be omitted from MADT or it must be marked
|
||||
* as disabled. However omitting non present CPU from
|
||||
* MADT breaks hotplug on linux. So possible CPUs
|
||||
* should be put in MADT but kept disabled.
|
||||
*/
|
||||
if (apic_id < 255) {
|
||||
AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
|
||||
|
||||
apic->type = ACPI_APIC_PROCESSOR;
|
||||
apic->length = sizeof(*apic);
|
||||
apic->processor_id = uid;
|
||||
apic->local_apic_id = apic_id;
|
||||
if (apic_ids->cpus[uid].cpu != NULL) {
|
||||
apic->flags = cpu_to_le32(1);
|
||||
} else {
|
||||
apic->flags = cpu_to_le32(0);
|
||||
}
|
||||
} else {
|
||||
AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
|
||||
|
||||
apic->type = ACPI_APIC_LOCAL_X2APIC;
|
||||
apic->length = sizeof(*apic);
|
||||
apic->uid = cpu_to_le32(uid);
|
||||
apic->x2apic_id = cpu_to_le32(apic_id);
|
||||
if (apic_ids->cpus[uid].cpu != NULL) {
|
||||
apic->flags = cpu_to_le32(1);
|
||||
} else {
|
||||
apic->flags = cpu_to_le32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
build_madt(GArray *table_data, BIOSLinker *linker,
|
||||
X86MachineState *x86ms, AcpiDeviceIf *adev)
|
||||
{
|
||||
MachineClass *mc = MACHINE_GET_CLASS(x86ms);
|
||||
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
|
||||
int madt_start = table_data->len;
|
||||
AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
|
||||
bool x2apic_mode = false;
|
||||
|
||||
AcpiMultipleApicTable *madt;
|
||||
AcpiMadtIoApic *io_apic;
|
||||
AcpiMadtIntsrcovr *intsrcovr;
|
||||
int i;
|
||||
|
||||
madt = acpi_data_push(table_data, sizeof *madt);
|
||||
madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
|
||||
madt->flags = cpu_to_le32(1);
|
||||
|
||||
for (i = 0; i < apic_ids->len; i++) {
|
||||
adevc->madt_cpu(adev, i, apic_ids, table_data);
|
||||
if (apic_ids->cpus[i].arch_id > 254) {
|
||||
x2apic_mode = true;
|
||||
}
|
||||
}
|
||||
|
||||
io_apic = acpi_data_push(table_data, sizeof *io_apic);
|
||||
io_apic->type = ACPI_APIC_IO;
|
||||
io_apic->length = sizeof(*io_apic);
|
||||
io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
|
||||
io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
|
||||
io_apic->interrupt = cpu_to_le32(0);
|
||||
|
||||
if (x86ms->apic_xrupt_override) {
|
||||
intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
|
||||
intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
|
||||
intsrcovr->length = sizeof(*intsrcovr);
|
||||
intsrcovr->source = 0;
|
||||
intsrcovr->gsi = cpu_to_le32(2);
|
||||
intsrcovr->flags = cpu_to_le16(0); /* conforms to bus specifications */
|
||||
}
|
||||
for (i = 1; i < 16; i++) {
|
||||
#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
|
||||
if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) {
|
||||
/* No need for a INT source override structure. */
|
||||
continue;
|
||||
}
|
||||
intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
|
||||
intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
|
||||
intsrcovr->length = sizeof(*intsrcovr);
|
||||
intsrcovr->source = i;
|
||||
intsrcovr->gsi = cpu_to_le32(i);
|
||||
intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */
|
||||
}
|
||||
|
||||
if (x2apic_mode) {
|
||||
AcpiMadtLocalX2ApicNmi *local_nmi;
|
||||
|
||||
local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
|
||||
local_nmi->type = ACPI_APIC_LOCAL_X2APIC_NMI;
|
||||
local_nmi->length = sizeof(*local_nmi);
|
||||
local_nmi->uid = 0xFFFFFFFF; /* all processors */
|
||||
local_nmi->flags = cpu_to_le16(0);
|
||||
local_nmi->lint = 1; /* ACPI_LINT1 */
|
||||
} else {
|
||||
AcpiMadtLocalNmi *local_nmi;
|
||||
|
||||
local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
|
||||
local_nmi->type = ACPI_APIC_LOCAL_NMI;
|
||||
local_nmi->length = sizeof(*local_nmi);
|
||||
local_nmi->processor_id = 0xff; /* all processors */
|
||||
local_nmi->flags = cpu_to_le16(0);
|
||||
local_nmi->lint = 1; /* ACPI_LINT1 */
|
||||
}
|
||||
|
||||
build_header(linker, table_data,
|
||||
(void *)(table_data->data + madt_start), "APIC",
|
||||
table_data->len - madt_start, 1, NULL, NULL);
|
||||
}
|
||||
|
||||
static void build_append_pcihp_notify_entry(Aml *method, int slot)
|
||||
{
|
||||
Aml *if_ctx;
|
||||
|
|
@ -2707,8 +2587,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
|||
aml_len += tables_blob->len - fadt;
|
||||
|
||||
acpi_add_table(table_offsets, tables_blob);
|
||||
build_madt(tables_blob, tables->linker, x86ms,
|
||||
ACPI_DEVICE_IF(pcms->acpi_dev));
|
||||
acpi_build_madt(tables_blob, tables->linker, x86ms,
|
||||
ACPI_DEVICE_IF(pcms->acpi_dev));
|
||||
|
||||
vmgenid_dev = find_vmgenid_dev();
|
||||
if (vmgenid_dev) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,152 @@
|
|||
/* Support for generating ACPI tables and passing them to Guests
|
||||
*
|
||||
* Copyright (C) 2008-2010 Kevin O'Connor <kevin@koconnor.net>
|
||||
* Copyright (C) 2006 Fabrice Bellard
|
||||
* Copyright (C) 2013 Red Hat Inc
|
||||
*
|
||||
* Author: Michael S. Tsirkin <mst@redhat.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
#include "exec/memory.h"
|
||||
#include "hw/acpi/acpi.h"
|
||||
#include "hw/acpi/aml-build.h"
|
||||
#include "hw/acpi/utils.h"
|
||||
#include "hw/i386/pc.h"
|
||||
#include "target/i386/cpu.h"
|
||||
|
||||
#include "acpi-build.h"
|
||||
#include "acpi-common.h"
|
||||
|
||||
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
|
||||
const CPUArchIdList *apic_ids, GArray *entry)
|
||||
{
|
||||
uint32_t apic_id = apic_ids->cpus[uid].arch_id;
|
||||
|
||||
/* ACPI spec says that LAPIC entry for non present
|
||||
* CPU may be omitted from MADT or it must be marked
|
||||
* as disabled. However omitting non present CPU from
|
||||
* MADT breaks hotplug on linux. So possible CPUs
|
||||
* should be put in MADT but kept disabled.
|
||||
*/
|
||||
if (apic_id < 255) {
|
||||
AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
|
||||
|
||||
apic->type = ACPI_APIC_PROCESSOR;
|
||||
apic->length = sizeof(*apic);
|
||||
apic->processor_id = uid;
|
||||
apic->local_apic_id = apic_id;
|
||||
if (apic_ids->cpus[uid].cpu != NULL) {
|
||||
apic->flags = cpu_to_le32(1);
|
||||
} else {
|
||||
apic->flags = cpu_to_le32(0);
|
||||
}
|
||||
} else {
|
||||
AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
|
||||
|
||||
apic->type = ACPI_APIC_LOCAL_X2APIC;
|
||||
apic->length = sizeof(*apic);
|
||||
apic->uid = cpu_to_le32(uid);
|
||||
apic->x2apic_id = cpu_to_le32(apic_id);
|
||||
if (apic_ids->cpus[uid].cpu != NULL) {
|
||||
apic->flags = cpu_to_le32(1);
|
||||
} else {
|
||||
apic->flags = cpu_to_le32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
|
||||
X86MachineState *x86ms, AcpiDeviceIf *adev)
|
||||
{
|
||||
MachineClass *mc = MACHINE_GET_CLASS(x86ms);
|
||||
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
|
||||
int madt_start = table_data->len;
|
||||
AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
|
||||
bool x2apic_mode = false;
|
||||
|
||||
AcpiMultipleApicTable *madt;
|
||||
AcpiMadtIoApic *io_apic;
|
||||
AcpiMadtIntsrcovr *intsrcovr;
|
||||
int i;
|
||||
|
||||
madt = acpi_data_push(table_data, sizeof *madt);
|
||||
madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
|
||||
madt->flags = cpu_to_le32(1);
|
||||
|
||||
for (i = 0; i < apic_ids->len; i++) {
|
||||
adevc->madt_cpu(adev, i, apic_ids, table_data);
|
||||
if (apic_ids->cpus[i].arch_id > 254) {
|
||||
x2apic_mode = true;
|
||||
}
|
||||
}
|
||||
|
||||
io_apic = acpi_data_push(table_data, sizeof *io_apic);
|
||||
io_apic->type = ACPI_APIC_IO;
|
||||
io_apic->length = sizeof(*io_apic);
|
||||
io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
|
||||
io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
|
||||
io_apic->interrupt = cpu_to_le32(0);
|
||||
|
||||
if (x86ms->apic_xrupt_override) {
|
||||
intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
|
||||
intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
|
||||
intsrcovr->length = sizeof(*intsrcovr);
|
||||
intsrcovr->source = 0;
|
||||
intsrcovr->gsi = cpu_to_le32(2);
|
||||
intsrcovr->flags = cpu_to_le16(0); /* conforms to bus specifications */
|
||||
}
|
||||
for (i = 1; i < 16; i++) {
|
||||
#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
|
||||
if (!(ACPI_BUILD_PCI_IRQS & (1 << i))) {
|
||||
/* No need for a INT source override structure. */
|
||||
continue;
|
||||
}
|
||||
intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
|
||||
intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE;
|
||||
intsrcovr->length = sizeof(*intsrcovr);
|
||||
intsrcovr->source = i;
|
||||
intsrcovr->gsi = cpu_to_le32(i);
|
||||
intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */
|
||||
}
|
||||
|
||||
if (x2apic_mode) {
|
||||
AcpiMadtLocalX2ApicNmi *local_nmi;
|
||||
|
||||
local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
|
||||
local_nmi->type = ACPI_APIC_LOCAL_X2APIC_NMI;
|
||||
local_nmi->length = sizeof(*local_nmi);
|
||||
local_nmi->uid = 0xFFFFFFFF; /* all processors */
|
||||
local_nmi->flags = cpu_to_le16(0);
|
||||
local_nmi->lint = 1; /* ACPI_LINT1 */
|
||||
} else {
|
||||
AcpiMadtLocalNmi *local_nmi;
|
||||
|
||||
local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
|
||||
local_nmi->type = ACPI_APIC_LOCAL_NMI;
|
||||
local_nmi->length = sizeof(*local_nmi);
|
||||
local_nmi->processor_id = 0xff; /* all processors */
|
||||
local_nmi->flags = cpu_to_le16(0);
|
||||
local_nmi->lint = 1; /* ACPI_LINT1 */
|
||||
}
|
||||
|
||||
build_header(linker, table_data,
|
||||
(void *)(table_data->data + madt_start), "APIC",
|
||||
table_data->len - madt_start, 1, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
#ifndef HW_I386_ACPI_COMMON_H
|
||||
#define HW_I386_ACPI_COMMON_H
|
||||
#include "include/hw/acpi/acpi_dev_interface.h"
|
||||
|
||||
#include "include/hw/acpi/bios-linker-loader.h"
|
||||
#include "include/hw/i386/x86.h"
|
||||
|
||||
/* Default IOAPIC ID */
|
||||
#define ACPI_BUILD_IOAPIC_ID 0x0
|
||||
|
||||
void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
|
||||
X86MachineState *x86ms, AcpiDeviceIf *adev);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue