This patchset moves all generation of ACPI tables from guest BIOS to the hypervisor.
Please review, and consider for 1.6.
Changes from v1 RFC: - added code to address cross version compatibility - rebased to latest bits - updated acpi tables to latest seabios bits (added pvpanic device)
Comments:
Although ACPI tables come from a system BIOS on real hw, it makes sense that the ACPI tables are coupled with the virtual machine, since they have to abstract the x86 machine to the OS's.
This is widely desired as a way to avoid the churn and proliferation of QEMU-specific interfaces associated with ACPI tables in bios code.
An RFC patchset adding support for hotplug of devices behind PCI to PCI bridges on top of this infrastructure was sent to the list a while ago. Latest version of that patchset will also be re-sent soon.
If you look at the actual code: i386: imports ACPI table generation code from seabios you will see that it's more complex than it needs to be, with lots of low level casts and similar tricks.
There's also a bit of duplication where we already declare similar acpi structures in qemu.
This is the result of code being a direct port from seabios. Laszlo's patch (build ACPI MADT (APIC) for fw_cfg) shows how this will be cleaned up by follow-up work. I think it's best to do it in this order: port code directly, and apply cleanups and reduce duplication that results, on top. This way it's much easier to see that we don't introduce regressions.
In particular, for a simple VM with piix, I booted a guest on qemu with and without the change, and verified that ACPI tables are unchanged except for trivial pointer address changes.
Such binary compatibility makes it easier to be confident that this change won't break things.
Michael S. Tsirkin (4): loader: support for unmapped ROM blobs loader: allow adding ROMs in done callbacks i386: generate pc guest info i386: ACPI table generation code from seabios
hw/acpi/ich9.c | 7 +- hw/acpi/piix4.c | 44 ++- hw/core/loader.c | 38 ++- hw/i386/Makefile.objs | 4 + hw/i386/acpi-build.c | 723 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-defs.h | 327 +++++++++++++++++++ hw/i386/pc.c | 43 ++- hw/i386/pc_piix.c | 18 +- hw/i386/pc_q35.c | 13 +- hw/i386/ssdt-misc.dsl | 46 +++ hw/isa/lpc_ich9.c | 11 +- hw/lm32/lm32_hwsetup.h | 2 +- hw/mips/mips_malta.c | 2 +- hw/misc/pvpanic.c | 12 +- hw/pci-host/q35.c | 1 + include/hw/acpi/ich9.h | 2 +- include/hw/i386/acpi-build.h | 9 + include/hw/i386/ich9.h | 3 +- include/hw/i386/pc.h | 38 ++- include/hw/loader.h | 5 +- vl.c | 3 + 21 files changed, 1321 insertions(+), 30 deletions(-) create mode 100644 hw/i386/acpi-build.c create mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/i386/acpi-build.h
Support ROM blobs not mapped into guest memory: let user pass in MR for memory serving as the backing store.
Signed-off-by: Michael S. Tsirkin mst@redhat.com --- hw/core/loader.c | 32 +++++++++++++++++++++++++++++--- hw/lm32/lm32_hwsetup.h | 2 +- include/hw/loader.h | 4 ++-- 3 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c index d569636..1ead722 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -542,6 +542,7 @@ struct Rom { size_t datasize;
uint8_t *data; + MemoryRegion *mr; int isrom; char *fw_dir; char *fw_file; @@ -641,7 +642,7 @@ err: }
int rom_add_blob(const char *name, const void *blob, size_t len, - hwaddr addr) + hwaddr addr, MemoryRegion *mr) { Rom *rom;
@@ -651,6 +652,11 @@ int rom_add_blob(const char *name, const void *blob, size_t len, rom->romsize = len; rom->datasize = len; rom->data = g_malloc0(rom->datasize); + rom->mr = mr; + if (mr) { + assert(memory_region_is_ram(mr)); + rom->isrom = memory_region_is_rom(mr); + } memcpy(rom->data, blob, len); rom_insert(rom); return 0; @@ -697,7 +703,12 @@ static void rom_reset(void *unused) if (rom->data == NULL) { continue; } - cpu_physical_memory_write_rom(rom->addr, rom->data, rom->datasize); + if (rom->mr) { + void *host = memory_region_get_ram_ptr(rom->mr); + memcpy(host, rom->data, rom->datasize); + } else { + cpu_physical_memory_write_rom(rom->addr, rom->data, rom->datasize); + } if (rom->isrom) { /* rom needs to be written only once */ g_free(rom->data); @@ -713,6 +724,9 @@ int rom_load_all(void) Rom *rom;
QTAILQ_FOREACH(rom, &roms, next) { + if (rom->mr) { + continue; + } if (rom->fw_file) { continue; } @@ -746,6 +760,9 @@ static Rom *find_rom(hwaddr addr) if (rom->fw_file) { continue; } + if (rom->mr) { + continue; + } if (rom->addr > addr) { continue; } @@ -773,6 +790,9 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->fw_file) { continue; } + if (rom->mr) { + continue; + } if (rom->addr + rom->romsize < addr) { continue; } @@ -832,7 +852,13 @@ void do_info_roms(Monitor *mon, const QDict *qdict) Rom *rom;
QTAILQ_FOREACH(rom, &roms, next) { - if (!rom->fw_file) { + if (rom->mr) { + monitor_printf(mon, "%s" + " size=0x%06zx name="%s"\n", + rom->mr->name, + rom->romsize, + rom->name); + } else if (!rom->fw_file) { monitor_printf(mon, "addr=" TARGET_FMT_plx " size=0x%06zx mem=%s name="%s"\n", rom->addr, rom->romsize, diff --git a/hw/lm32/lm32_hwsetup.h b/hw/lm32/lm32_hwsetup.h index 3449bd8..d6914d6 100644 --- a/hw/lm32/lm32_hwsetup.h +++ b/hw/lm32/lm32_hwsetup.h @@ -73,7 +73,7 @@ static inline void hwsetup_free(HWSetup *hw) static inline void hwsetup_create_rom(HWSetup *hw, hwaddr base) { - rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, base); + rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, base, NULL); }
static inline void hwsetup_add_u8(HWSetup *hw, uint8_t u) diff --git a/include/hw/loader.h b/include/hw/loader.h index 15d4cc9..b39e7d1 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -27,7 +27,7 @@ void pstrcpy_targphys(const char *name, int rom_add_file(const char *file, const char *fw_dir, hwaddr addr, int32_t bootindex); int rom_add_blob(const char *name, const void *blob, size_t len, - hwaddr addr); + hwaddr addr, MemoryRegion *mr); int rom_add_elf_program(const char *name, void *data, size_t datasize, size_t romsize, hwaddr addr); int rom_load_all(void); @@ -39,7 +39,7 @@ void do_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_file_fixed(_f, _a, _i) \ rom_add_file(_f, NULL, _a, _i) #define rom_add_blob_fixed(_f, _b, _l, _a) \ - rom_add_blob(_f, _b, _l, _a) + rom_add_blob(_f, _b, _l, _a, NULL)
#define PC_ROM_MIN_VGA 0xc0000 #define PC_ROM_MIN_OPTION 0xc8000
Don't abort if machine done callbacks add ROMs.
Signed-off-by: Michael S. Tsirkin mst@redhat.com --- hw/core/loader.c | 6 +++++- include/hw/loader.h | 1 + vl.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c index 1ead722..3f1d89b 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -743,10 +743,14 @@ int rom_load_all(void) rom->isrom = int128_nz(section.size) && memory_region_is_rom(section.mr); } qemu_register_reset(rom_reset, NULL); - roms_loaded = 1; return 0; }
+void rom_load_done(void) +{ + roms_loaded = 1; +} + void rom_set_fw(FWCfgState *f) { fw_cfg = f; diff --git a/include/hw/loader.h b/include/hw/loader.h index b39e7d1..976e5cd 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -31,6 +31,7 @@ int rom_add_blob(const char *name, const void *blob, size_t len, int rom_add_elf_program(const char *name, void *data, size_t datasize, size_t romsize, hwaddr addr); int rom_load_all(void); +void rom_load_done(void); void rom_set_fw(FWCfgState *f); int rom_copy(uint8_t *dest, hwaddr addr, size_t size); void *rom_ptr(hwaddr addr); diff --git a/vl.c b/vl.c index 6d9fd7d..8190504 100644 --- a/vl.c +++ b/vl.c @@ -4377,6 +4377,9 @@ int main(int argc, char **argv, char **envp) qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); qemu_run_machine_init_done_notifiers();
+ /* Done notifiers can load ROMs */ + rom_load_done(); + qemu_system_reset(VMRESET_SILENT); if (loadvm) { if (load_vmstate(loadvm) < 0) {
This fills in guest info table with misc information of interest to the guest. Will be used by ACPI table generation code.
Signed-off-by: Michael S. Tsirkin mst@redhat.com --- hw/acpi/ich9.c | 7 ++++++- hw/acpi/piix4.c | 44 +++++++++++++++++++++++++++++++++++++++++++- hw/i386/Makefile.objs | 2 ++ hw/i386/pc.c | 41 +++++++++++++++++++++++++++++++++++++++-- hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 10 +++++++--- hw/isa/lpc_ich9.c | 11 +++++++++-- hw/mips/mips_malta.c | 2 +- hw/misc/pvpanic.c | 12 +++++++----- hw/pci-host/q35.c | 1 + include/hw/acpi/ich9.h | 2 +- include/hw/i386/ich9.h | 3 ++- include/hw/i386/pc.h | 37 ++++++++++++++++++++++++++++++++++--- 13 files changed, 164 insertions(+), 23 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4a17f32..764e27f 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -203,7 +203,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque) }
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, - qemu_irq sci_irq) + qemu_irq sci_irq, PcGuestInfo *guest_info) { memory_region_init(&pm->io, "ich9-pm", ICH9_PMIO_SIZE); memory_region_set_enabled(&pm->io, false); @@ -219,6 +219,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, ICH9_PMIO_GPE0_LEN); memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
+ guest_info->gpe0_blk = PC_GUEST_PORT_ACPI_PM_BASE + ICH9_PMIO_GPE0_STS; + guest_info->gpe0_blk_len = ICH9_PMIO_GPE0_LEN; + guest_info->fix_rtc = true; + guest_info->platform_timer = false; + memory_region_init_io(&pm->io_smi, &ich9_smi_ops, pm, "apci-smi", 8); memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 756df3b..c077a7a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -94,6 +94,8 @@ typedef struct PIIX4PMState {
CPUStatus gpe_cpu; Notifier cpu_added_notifier; + + PcGuestInfo *guest_info; } PIIX4PMState;
static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, @@ -380,6 +382,27 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque) acpi_pm1_evt_power_down(&s->ar); }
+static void piix4_update_guest_info(PIIX4PMState *s) +{ + PCIDevice *dev = &s->dev; + BusState *bus = qdev_get_parent_bus(&dev->qdev); + BusChild *kid, *next; + + memset(s->guest_info->slot_hotplug_enable, 0xff, + DIV_ROUND_UP(PCI_SLOT_MAX, BITS_PER_BYTE)); + + QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) { + DeviceState *qdev = kid->child; + PCIDevice *pdev = PCI_DEVICE(qdev); + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pdev); + int slot = PCI_SLOT(pdev->devfn); + + if (pc->no_hotplug) { + clear_bit(slot, s->guest_info->slot_hotplug_enable); + } + } +} + static void piix4_pm_machine_ready(Notifier *n, void *opaque) { PIIX4PMState *s = container_of(n, PIIX4PMState, machine_ready); @@ -391,6 +414,9 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) pci_conf[0x67] = (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) | (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0);
+ if (s->guest_info) { + piix4_update_guest_info(s); + } }
static int piix4_pm_initfn(PCIDevice *dev) @@ -447,7 +473,8 @@ static int piix4_pm_initfn(PCIDevice *dev)
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, - int kvm_enabled, FWCfgState *fw_cfg) + int kvm_enabled, FWCfgState *fw_cfg, + PcGuestInfo *guest_info) { PCIDevice *dev; PIIX4PMState *s; @@ -470,6 +497,21 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup(suspend, 6), 6); }
+ if (guest_info) { + s->guest_info = guest_info; + + guest_info->s3_disabled = s->disable_s3; + guest_info->s4_disabled = s->disable_s4; + guest_info->s4_val = s->s4_val; + + guest_info->acpi_enable_cmd = ACPI_ENABLE; + guest_info->acpi_disable_cmd = ACPI_DISABLE; + guest_info->gpe0_blk = GPE_BASE; + guest_info->gpe0_blk_len = GPE_LEN; + guest_info->fix_rtc = false; + guest_info->platform_timer = true; + } + return s->smb.smbus; }
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 71be2da..e783050 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -5,6 +5,8 @@ obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o obj-y += bios-linker-loader.o +hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex +hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \ ; then echo "$(2)"; else echo "$(3)"; fi ;) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4b29685..e5ebfa5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1012,6 +1012,27 @@ static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info) fw_cfg_add_file(guest_info->fw_cfg, "etc/pci-info", info, sizeof *info); }
+static void pc_set_cpu_guest_info(CPUState *cpu, void *arg) +{ + PcGuestInfo *guest_info = arg; + CPUClass *klass = CPU_GET_CLASS(cpu); + uint64_t apic_id = klass->get_arch_id(cpu); + int j; + + assert(apic_id <= MAX_CPUMASK_BITS); + assert(apic_id < guest_info->apic_id_limit); + + set_bit(apic_id, guest_info->found_cpus); + + for (j = 0; j < guest_info->numa_nodes; j++) { + assert(cpu->cpu_index < max_cpus); + if (test_bit(cpu->cpu_index, node_cpumask[j])) { + guest_info->node_cpu[apic_id] = cpu_to_le64(j); + break; + } + } +} + typedef struct PcGuestInfoState { PcGuestInfo info; Notifier machine_done; @@ -1032,6 +1053,18 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); PcGuestInfo *guest_info = &guest_info_state->info;
+ guest_info->ram_size = below_4g_mem_size + above_4g_mem_size; + guest_info->apic_id_limit = pc_apic_id_limit(max_cpus); + guest_info->apic_xrupt_override = kvm_allows_irq0_override(); + guest_info->numa_nodes = nb_numa_nodes; + guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes * + sizeof *guest_info->node_mem); + guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit * + sizeof *guest_info->node_mem); + + memset(&guest_info->found_cpus, 0, sizeof guest_info->found_cpus); + qemu_for_each_cpu(pc_set_cpu_guest_info, guest_info); + guest_info->pci_info.w32.end = IO_APIC_DEFAULT_ADDRESS; if (sizeof(hwaddr) == 4) { guest_info->pci_info.w64.begin = 0; @@ -1204,7 +1237,8 @@ static const MemoryRegionOps ioportF0_io_ops = { void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy, - bool no_vmport) + bool no_vmport, + PcGuestInfo *guest_info) { int i; DriveInfo *fd[MAX_FD]; @@ -1230,7 +1264,10 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, * Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT * when the HPET wants to take over. Thus we have to disable the latter. */ - if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) { + guest_info->has_hpet = !no_hpet && + (!kvm_irqchip_in_kernel() || kvm_has_pit_state2()); + + if (guest_info->has_hpet) { hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);
if (hpet) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ecd1490..3c2541a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,6 +50,8 @@ # include <xen/hvm/hvm_info_table.h> #endif
+#include "hw/i386/acpi-dsdt.hex" + #define MAX_IDE_BUS 2
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -122,6 +124,10 @@ static void pc_init1(MemoryRegion *system_memory, }
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); + + guest_info->dsdt_code = AcpiDsdtAmlCode; + guest_info->dsdt_size = sizeof AcpiDsdtAmlCode; + guest_info->has_pci_info = has_pci_info;
/* Set PCI window size the way seabios has always done it. */ @@ -190,7 +196,8 @@ static void pc_init1(MemoryRegion *system_memory, pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
/* init basic PC hardware */ - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled()); + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(), + guest_info);
pc_nic_init(isa_bus, pci_bus);
@@ -229,7 +236,9 @@ static void pc_init1(MemoryRegion *system_memory, /* TODO: Populate SPD eeprom data. */ smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, gsi[9], *smi_irq, - kvm_enabled(), fw_cfg); + kvm_enabled(), fw_cfg, + guest_info); + guest_info->sci_int = 9; smbus_eeprom_init(smbus, 8, NULL, 0); }
@@ -238,7 +247,7 @@ static void pc_init1(MemoryRegion *system_memory, }
if (has_pvpanic) { - pvpanic_init(isa_bus); + pvpanic_init(isa_bus, guest_info); } }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5b92160..50afe7c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -43,6 +43,8 @@ #include "hw/usb.h" #include "hw/cpu/icc_bus.h"
+#include "hw/i386/q35-acpi-dsdt.hex" + /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6
@@ -109,6 +111,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info; + guest_info->dsdt_code = Q35AcpiDsdtAmlCode; + guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
/* allocate ram and load rom/bios */ if (!xen_enabled()) { @@ -175,10 +179,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_register_ferr_irq(gsi[13]);
/* init basic PC hardware */ - pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false); + pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, guest_info);
/* connect pm stuff to lpc */ - ich9_lpc_pm_init(lpc); + ich9_lpc_pm_init(lpc, guest_info);
/* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = pci_create_simple_multifunction(host_bus, @@ -210,7 +214,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) }
if (has_pvpanic) { - pvpanic_init(isa_bus); + pvpanic_init(isa_bus, guest_info); } }
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 667e882..a742fcb 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -312,6 +312,13 @@ PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin) return route; }
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info) +{ + guest_info->sci_int = 9; + guest_info->acpi_enable_cmd = ICH9_APM_ACPI_ENABLE; + guest_info->acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; +} + static int ich9_lpc_sci_irq(ICH9LPCState *lpc) { switch (lpc->d.config[ICH9_LPC_ACPI_CTRL] & @@ -356,13 +363,13 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) } }
-void ich9_lpc_pm_init(PCIDevice *lpc_pci) +void ich9_lpc_pm_init(PCIDevice *lpc_pci, PcGuestInfo *guest_info) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci); qemu_irq *sci_irq;
sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1); - ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]); + ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0], guest_info);
ich9_lpc_reset(&lpc->d.qdev); } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 5843fad..b95597c 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -964,7 +964,7 @@ void mips_malta_init(QEMUMachineInitArgs *args) pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, 0, NULL); + isa_get_irq(NULL, 9), NULL, 0, NULL, NULL); /* TODO: Populate SPD eeprom data. */ smbus_eeprom_init(smbus, 8, NULL, 0); pit = pit_init(isa_bus, 0x40, 0, NULL); diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 792d8e4..7af713a 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -101,25 +101,27 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(d, &s->io, s->ioport); }
-static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg) +static void pvpanic_guest_info(ISADevice *dev, PcGuestInfo *guest_info) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); uint16_t *pvpanic_port = g_malloc(sizeof(*pvpanic_port)); *pvpanic_port = cpu_to_le16(s->ioport);
- fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port, + fw_cfg_add_file(guest_info->fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port)); + + guest_info->pvpanic_port = s->ioport; }
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev; - FWCfgState *fw_cfg = fw_cfg_find(); + FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE); - pvpanic_fw_cfg(dev, fw_cfg); + pvpanic_guest_info(dev, guest_info); }
static Property pvpanic_isa_properties[] = { diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 13148ed..667bd20 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -260,6 +260,7 @@ static int mch_init(PCIDevice *d) */ mch->guest_info->pci_info.w32.begin = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT + MCH_HOST_BRIDGE_PCIEXBAR_MAX; + mch->guest_info->mcfg_base = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT;
/* setup pci memory regions */ memory_region_init_alias(&mch->pci_hole, "pci-hole", diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index b1fe71f..66ab31a 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -45,7 +45,7 @@ typedef struct ICH9LPCPMRegs { } ICH9LPCPMRegs;
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, - qemu_irq sci_irq); + qemu_irq sci_irq, PcGuestInfo *guest_info); void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base); extern const VMStateDescription vmstate_ich9_pm;
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index c5f637b..7428452 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -15,10 +15,11 @@ #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h"
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info); void ich9_lpc_set_irq(void *opaque, int irq_num, int level); int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx); PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin); -void ich9_lpc_pm_init(PCIDevice *pci_lpc); +void ich9_lpc_pm_init(PCIDevice *pci_lpc, PcGuestInfo *guest_info); PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus); i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 56f2e41..b29c8f6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -10,6 +10,9 @@ #include "hw/i386/ioapic.h"
#include "qemu/range.h" +#include "qemu/bitmap.h" +#include "sysemu/sysemu.h" +#include "hw/pci/pci.h"
/* PC-style peripherals (also used by other machines). */
@@ -18,9 +21,35 @@ typedef struct PcPciInfo { Range w64; } PcPciInfo;
+/* Matches the value hard-coded in BIOS */ +#define PC_GUEST_PORT_ACPI_PM_BASE 0xb000 + struct PcGuestInfo { PcPciInfo pci_info; bool has_pci_info; + hwaddr ram_size; + unsigned apic_id_limit; + bool apic_xrupt_override; + bool has_hpet; + uint64_t numa_nodes; + uint64_t *node_mem; + uint64_t *node_cpu; + DECLARE_BITMAP(found_cpus, MAX_CPUMASK_BITS + 1); + bool s3_disabled; + bool s4_disabled; + uint8_t s4_val; + DECLARE_BITMAP(slot_hotplug_enable, PCI_SLOT_MAX); + uint16_t sci_int; + uint8_t acpi_enable_cmd; + uint8_t acpi_disable_cmd; + uint32_t gpe0_blk; + uint32_t gpe0_blk_len; + bool fix_rtc; + bool platform_timer; + uint64_t mcfg_base; + const unsigned char *dsdt_code; + unsigned dsdt_size; + uint16_t pvpanic_port; FWCfgState *fw_cfg; };
@@ -114,7 +143,8 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy, - bool no_vmport); + bool no_vmport, + PcGuestInfo *guest_info); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, @@ -132,7 +162,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, - int kvm_enabled, FWCfgState *fw_cfg); + int kvm_enabled, FWCfgState *fw_cfg, + PcGuestInfo *guest_info); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
/* hpet.c */ @@ -194,7 +225,7 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) void pc_system_firmware_init(MemoryRegion *rom_memory);
/* pvpanic.c */ -void pvpanic_init(ISABus *bus); +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info);
/* e820 types */ #define E820_RAM 1
"Michael S. Tsirkin" mst@redhat.com writes:
This fills in guest info table with misc information of interest to the guest. Will be used by ACPI table generation code.
Signed-off-by: Michael S. Tsirkin mst@redhat.com
hw/acpi/ich9.c | 7 ++++++- hw/acpi/piix4.c | 44 +++++++++++++++++++++++++++++++++++++++++++- hw/i386/Makefile.objs | 2 ++ hw/i386/pc.c | 41 +++++++++++++++++++++++++++++++++++++++-- hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 10 +++++++--- hw/isa/lpc_ich9.c | 11 +++++++++-- hw/mips/mips_malta.c | 2 +- hw/misc/pvpanic.c | 12 +++++++----- hw/pci-host/q35.c | 1 + include/hw/acpi/ich9.h | 2 +- include/hw/i386/ich9.h | 3 ++- include/hw/i386/pc.h | 37 ++++++++++++++++++++++++++++++++++--- 13 files changed, 164 insertions(+), 23 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4a17f32..764e27f 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -203,7 +203,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque) }
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
qemu_irq sci_irq)
qemu_irq sci_irq, PcGuestInfo *guest_info){ memory_region_init(&pm->io, "ich9-pm", ICH9_PMIO_SIZE); memory_region_set_enabled(&pm->io, false); @@ -219,6 +219,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, ICH9_PMIO_GPE0_LEN); memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
- guest_info->gpe0_blk = PC_GUEST_PORT_ACPI_PM_BASE + ICH9_PMIO_GPE0_STS;
- guest_info->gpe0_blk_len = ICH9_PMIO_GPE0_LEN;
- guest_info->fix_rtc = true;
- guest_info->platform_timer = false;
- memory_region_init_io(&pm->io_smi, &ich9_smi_ops, pm, "apci-smi", 8); memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 756df3b..c077a7a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -94,6 +94,8 @@ typedef struct PIIX4PMState {
CPUStatus gpe_cpu; Notifier cpu_added_notifier;
- PcGuestInfo *guest_info;
} PIIX4PMState;
static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, @@ -380,6 +382,27 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque) acpi_pm1_evt_power_down(&s->ar); }
+static void piix4_update_guest_info(PIIX4PMState *s) +{
- PCIDevice *dev = &s->dev;
- BusState *bus = qdev_get_parent_bus(&dev->qdev);
- BusChild *kid, *next;
- memset(s->guest_info->slot_hotplug_enable, 0xff,
DIV_ROUND_UP(PCI_SLOT_MAX, BITS_PER_BYTE));- QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {
DeviceState *qdev = kid->child;PCIDevice *pdev = PCI_DEVICE(qdev);PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pdev);int slot = PCI_SLOT(pdev->devfn);if (pc->no_hotplug) {clear_bit(slot, s->guest_info->slot_hotplug_enable);}- }
+}
static void piix4_pm_machine_ready(Notifier *n, void *opaque) { PIIX4PMState *s = container_of(n, PIIX4PMState, machine_ready); @@ -391,6 +414,9 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) pci_conf[0x67] = (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) | (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0);
- if (s->guest_info) {
piix4_update_guest_info(s);- }
}
static int piix4_pm_initfn(PCIDevice *dev) @@ -447,7 +473,8 @@ static int piix4_pm_initfn(PCIDevice *dev)
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg)
int kvm_enabled, FWCfgState *fw_cfg,PcGuestInfo *guest_info){ PCIDevice *dev; PIIX4PMState *s; @@ -470,6 +497,21 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup(suspend, 6), 6); }
- if (guest_info) {
s->guest_info = guest_info;guest_info->s3_disabled = s->disable_s3;guest_info->s4_disabled = s->disable_s4;guest_info->s4_val = s->s4_val;guest_info->acpi_enable_cmd = ACPI_ENABLE;guest_info->acpi_disable_cmd = ACPI_DISABLE;guest_info->gpe0_blk = GPE_BASE;guest_info->gpe0_blk_len = GPE_LEN;guest_info->fix_rtc = false;guest_info->platform_timer = true;- }
- return s->smb.smbus;
}
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 71be2da..e783050 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -5,6 +5,8 @@ obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o obj-y += bios-linker-loader.o +hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex +hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \ ; then echo "$(2)"; else echo "$(3)"; fi ;) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4b29685..e5ebfa5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1012,6 +1012,27 @@ static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info) fw_cfg_add_file(guest_info->fw_cfg, "etc/pci-info", info, sizeof *info); }
+static void pc_set_cpu_guest_info(CPUState *cpu, void *arg) +{
- PcGuestInfo *guest_info = arg;
- CPUClass *klass = CPU_GET_CLASS(cpu);
- uint64_t apic_id = klass->get_arch_id(cpu);
- int j;
- assert(apic_id <= MAX_CPUMASK_BITS);
- assert(apic_id < guest_info->apic_id_limit);
- set_bit(apic_id, guest_info->found_cpus);
- for (j = 0; j < guest_info->numa_nodes; j++) {
assert(cpu->cpu_index < max_cpus);if (test_bit(cpu->cpu_index, node_cpumask[j])) {guest_info->node_cpu[apic_id] = cpu_to_le64(j);break;}- }
+}
typedef struct PcGuestInfoState { PcGuestInfo info; Notifier machine_done; @@ -1032,6 +1053,18 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); PcGuestInfo *guest_info = &guest_info_state->info;
- guest_info->ram_size = below_4g_mem_size + above_4g_mem_size;
- guest_info->apic_id_limit = pc_apic_id_limit(max_cpus);
- guest_info->apic_xrupt_override = kvm_allows_irq0_override();
- guest_info->numa_nodes = nb_numa_nodes;
- guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes *
sizeof *guest_info->node_mem);- guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit *
sizeof *guest_info->node_mem);
This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
- memset(&guest_info->found_cpus, 0, sizeof guest_info->found_cpus);
- qemu_for_each_cpu(pc_set_cpu_guest_info, guest_info);
- guest_info->pci_info.w32.end = IO_APIC_DEFAULT_ADDRESS; if (sizeof(hwaddr) == 4) { guest_info->pci_info.w64.begin = 0;
@@ -1204,7 +1237,8 @@ static const MemoryRegionOps ioportF0_io_ops = { void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy,
bool no_vmport)
bool no_vmport,PcGuestInfo *guest_info){ int i; DriveInfo *fd[MAX_FD]; @@ -1230,7 +1264,10 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, * Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT * when the HPET wants to take over. Thus we have to disable the latter. */
- if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {
guest_info->has_hpet = !no_hpet &&
(!kvm_irqchip_in_kernel() || kvm_has_pit_state2());if (guest_info->has_hpet) { hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);
if (hpet) {diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ecd1490..3c2541a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,6 +50,8 @@ # include <xen/hvm/hvm_info_table.h> #endif
+#include "hw/i386/acpi-dsdt.hex"
#define MAX_IDE_BUS 2
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -122,6 +124,10 @@ static void pc_init1(MemoryRegion *system_memory, }
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
guest_info->dsdt_code = AcpiDsdtAmlCode;
guest_info->dsdt_size = sizeof AcpiDsdtAmlCode;
guest_info->has_pci_info = has_pci_info;
/* Set PCI window size the way seabios has always done it. */
@@ -190,7 +196,8 @@ static void pc_init1(MemoryRegion *system_memory, pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(),
guest_info);pc_nic_init(isa_bus, pci_bus);
@@ -229,7 +236,9 @@ static void pc_init1(MemoryRegion *system_memory, /* TODO: Populate SPD eeprom data. */ smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, gsi[9], *smi_irq,
kvm_enabled(), fw_cfg);
kvm_enabled(), fw_cfg,guest_info);guest_info->sci_int = 9; smbus_eeprom_init(smbus, 8, NULL, 0);@@ -238,7 +247,7 @@ static void pc_init1(MemoryRegion *system_memory, }
if (has_pvpanic) {
pvpanic_init(isa_bus);
pvpanic_init(isa_bus, guest_info);}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5b92160..50afe7c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -43,6 +43,8 @@ #include "hw/usb.h" #include "hw/cpu/icc_bus.h"
+#include "hw/i386/q35-acpi-dsdt.hex"
/* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6
@@ -109,6 +111,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info;
guest_info->dsdt_code = Q35AcpiDsdtAmlCode;
guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
/* allocate ram and load rom/bios */ if (!xen_enabled()) {
@@ -175,10 +179,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_register_ferr_irq(gsi[13]);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false);
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, guest_info);
/* connect pm stuff to lpc */
- ich9_lpc_pm_init(lpc);
ich9_lpc_pm_init(lpc, guest_info);
/* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = pci_create_simple_multifunction(host_bus,
@@ -210,7 +214,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) }
if (has_pvpanic) {
pvpanic_init(isa_bus);
pvpanic_init(isa_bus, guest_info);}
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 667e882..a742fcb 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -312,6 +312,13 @@ PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin) return route; }
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info) +{
- guest_info->sci_int = 9;
- guest_info->acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
- guest_info->acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
+}
static int ich9_lpc_sci_irq(ICH9LPCState *lpc) { switch (lpc->d.config[ICH9_LPC_ACPI_CTRL] & @@ -356,13 +363,13 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) } }
-void ich9_lpc_pm_init(PCIDevice *lpc_pci) +void ich9_lpc_pm_init(PCIDevice *lpc_pci, PcGuestInfo *guest_info) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci); qemu_irq *sci_irq;
sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1);
- ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]);
ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0], guest_info);
ich9_lpc_reset(&lpc->d.qdev);
} diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 5843fad..b95597c 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -964,7 +964,7 @@ void mips_malta_init(QEMUMachineInitArgs *args) pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
isa_get_irq(NULL, 9), NULL, 0, NULL);
isa_get_irq(NULL, 9), NULL, 0, NULL, NULL);diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 792d8e4..7af713a 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -101,25 +101,27 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(d, &s->io, s->ioport); }
-static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg) +static void pvpanic_guest_info(ISADevice *dev, PcGuestInfo *guest_info) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); uint16_t *pvpanic_port = g_malloc(sizeof(*pvpanic_port)); *pvpanic_port = cpu_to_le16(s->ioport);
- fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
- fw_cfg_add_file(guest_info->fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port));
- guest_info->pvpanic_port = s->ioport;
}
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
static Property pvpanic_isa_properties[] = { diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 13148ed..667bd20 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -260,6 +260,7 @@ static int mch_init(PCIDevice *d) */ mch->guest_info->pci_info.w32.begin = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT + MCH_HOST_BRIDGE_PCIEXBAR_MAX;
mch->guest_info->mcfg_base = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT;
/* setup pci memory regions */ memory_region_init_alias(&mch->pci_hole, "pci-hole",
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index b1fe71f..66ab31a 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -45,7 +45,7 @@ typedef struct ICH9LPCPMRegs { } ICH9LPCPMRegs;
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
qemu_irq sci_irq);
qemu_irq sci_irq, PcGuestInfo *guest_info);void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base); extern const VMStateDescription vmstate_ich9_pm;
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index c5f637b..7428452 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -15,10 +15,11 @@ #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h"
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info); void ich9_lpc_set_irq(void *opaque, int irq_num, int level); int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx); PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin); -void ich9_lpc_pm_init(PCIDevice *pci_lpc); +void ich9_lpc_pm_init(PCIDevice *pci_lpc, PcGuestInfo *guest_info); PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus); i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 56f2e41..b29c8f6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -10,6 +10,9 @@ #include "hw/i386/ioapic.h"
#include "qemu/range.h" +#include "qemu/bitmap.h" +#include "sysemu/sysemu.h" +#include "hw/pci/pci.h"
/* PC-style peripherals (also used by other machines). */
@@ -18,9 +21,35 @@ typedef struct PcPciInfo { Range w64; } PcPciInfo;
+/* Matches the value hard-coded in BIOS */ +#define PC_GUEST_PORT_ACPI_PM_BASE 0xb000
struct PcGuestInfo { PcPciInfo pci_info; bool has_pci_info;
- hwaddr ram_size;
- unsigned apic_id_limit;
- bool apic_xrupt_override;
- bool has_hpet;
- uint64_t numa_nodes;
- uint64_t *node_mem;
- uint64_t *node_cpu;
- DECLARE_BITMAP(found_cpus, MAX_CPUMASK_BITS + 1);
- bool s3_disabled;
- bool s4_disabled;
- uint8_t s4_val;
- DECLARE_BITMAP(slot_hotplug_enable, PCI_SLOT_MAX);
- uint16_t sci_int;
- uint8_t acpi_enable_cmd;
- uint8_t acpi_disable_cmd;
- uint32_t gpe0_blk;
- uint32_t gpe0_blk_len;
- bool fix_rtc;
- bool platform_timer;
- uint64_t mcfg_base;
- const unsigned char *dsdt_code;
- unsigned dsdt_size;
- uint16_t pvpanic_port;
This is all stuff that should be obtained via QOM.
Doing it this way just makes it all that much harder to detangle the PC initialization mess we already have.
Regards,
Anthony Liguori
FWCfgState *fw_cfg;};
@@ -114,7 +143,8 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy,
bool no_vmport);
bool no_vmport,PcGuestInfo *guest_info);void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, @@ -132,7 +162,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg);
int kvm_enabled, FWCfgState *fw_cfg,PcGuestInfo *guest_info);void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
/* hpet.c */ @@ -194,7 +225,7 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) void pc_system_firmware_init(MemoryRegion *rom_memory);
/* pvpanic.c */ -void pvpanic_init(ISABus *bus); +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info);
/* e820 types */
#define E820_RAM 1
MST
SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
On Mon, Jul 08, 2013 at 02:10:03PM -0500, Anthony Liguori wrote:
"Michael S. Tsirkin" mst@redhat.com writes:
This fills in guest info table with misc information of interest to the guest. Will be used by ACPI table generation code.
Signed-off-by: Michael S. Tsirkin mst@redhat.com
hw/acpi/ich9.c | 7 ++++++- hw/acpi/piix4.c | 44 +++++++++++++++++++++++++++++++++++++++++++- hw/i386/Makefile.objs | 2 ++ hw/i386/pc.c | 41 +++++++++++++++++++++++++++++++++++++++-- hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 10 +++++++--- hw/isa/lpc_ich9.c | 11 +++++++++-- hw/mips/mips_malta.c | 2 +- hw/misc/pvpanic.c | 12 +++++++----- hw/pci-host/q35.c | 1 + include/hw/acpi/ich9.h | 2 +- include/hw/i386/ich9.h | 3 ++- include/hw/i386/pc.h | 37 ++++++++++++++++++++++++++++++++++--- 13 files changed, 164 insertions(+), 23 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4a17f32..764e27f 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -203,7 +203,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque) }
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
qemu_irq sci_irq)
qemu_irq sci_irq, PcGuestInfo *guest_info){ memory_region_init(&pm->io, "ich9-pm", ICH9_PMIO_SIZE); memory_region_set_enabled(&pm->io, false); @@ -219,6 +219,11 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, ICH9_PMIO_GPE0_LEN); memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
- guest_info->gpe0_blk = PC_GUEST_PORT_ACPI_PM_BASE + ICH9_PMIO_GPE0_STS;
- guest_info->gpe0_blk_len = ICH9_PMIO_GPE0_LEN;
- guest_info->fix_rtc = true;
- guest_info->platform_timer = false;
- memory_region_init_io(&pm->io_smi, &ich9_smi_ops, pm, "apci-smi", 8); memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 756df3b..c077a7a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -94,6 +94,8 @@ typedef struct PIIX4PMState {
CPUStatus gpe_cpu; Notifier cpu_added_notifier;
- PcGuestInfo *guest_info;
} PIIX4PMState;
static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, @@ -380,6 +382,27 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque) acpi_pm1_evt_power_down(&s->ar); }
+static void piix4_update_guest_info(PIIX4PMState *s) +{
- PCIDevice *dev = &s->dev;
- BusState *bus = qdev_get_parent_bus(&dev->qdev);
- BusChild *kid, *next;
- memset(s->guest_info->slot_hotplug_enable, 0xff,
DIV_ROUND_UP(PCI_SLOT_MAX, BITS_PER_BYTE));- QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {
DeviceState *qdev = kid->child;PCIDevice *pdev = PCI_DEVICE(qdev);PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pdev);int slot = PCI_SLOT(pdev->devfn);if (pc->no_hotplug) {clear_bit(slot, s->guest_info->slot_hotplug_enable);}- }
+}
static void piix4_pm_machine_ready(Notifier *n, void *opaque) { PIIX4PMState *s = container_of(n, PIIX4PMState, machine_ready); @@ -391,6 +414,9 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) pci_conf[0x67] = (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) | (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0);
- if (s->guest_info) {
piix4_update_guest_info(s);- }
}
static int piix4_pm_initfn(PCIDevice *dev) @@ -447,7 +473,8 @@ static int piix4_pm_initfn(PCIDevice *dev)
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg)
int kvm_enabled, FWCfgState *fw_cfg,PcGuestInfo *guest_info){ PCIDevice *dev; PIIX4PMState *s; @@ -470,6 +497,21 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup(suspend, 6), 6); }
- if (guest_info) {
s->guest_info = guest_info;guest_info->s3_disabled = s->disable_s3;guest_info->s4_disabled = s->disable_s4;guest_info->s4_val = s->s4_val;guest_info->acpi_enable_cmd = ACPI_ENABLE;guest_info->acpi_disable_cmd = ACPI_DISABLE;guest_info->gpe0_blk = GPE_BASE;guest_info->gpe0_blk_len = GPE_LEN;guest_info->fix_rtc = false;guest_info->platform_timer = true;- }
- return s->smb.smbus;
}
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 71be2da..e783050 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -5,6 +5,8 @@ obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o obj-y += bios-linker-loader.o +hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex +hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \ ; then echo "$(2)"; else echo "$(3)"; fi ;) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4b29685..e5ebfa5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1012,6 +1012,27 @@ static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info) fw_cfg_add_file(guest_info->fw_cfg, "etc/pci-info", info, sizeof *info); }
+static void pc_set_cpu_guest_info(CPUState *cpu, void *arg) +{
- PcGuestInfo *guest_info = arg;
- CPUClass *klass = CPU_GET_CLASS(cpu);
- uint64_t apic_id = klass->get_arch_id(cpu);
- int j;
- assert(apic_id <= MAX_CPUMASK_BITS);
- assert(apic_id < guest_info->apic_id_limit);
- set_bit(apic_id, guest_info->found_cpus);
- for (j = 0; j < guest_info->numa_nodes; j++) {
assert(cpu->cpu_index < max_cpus);if (test_bit(cpu->cpu_index, node_cpumask[j])) {guest_info->node_cpu[apic_id] = cpu_to_le64(j);break;}- }
+}
typedef struct PcGuestInfoState { PcGuestInfo info; Notifier machine_done; @@ -1032,6 +1053,18 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); PcGuestInfo *guest_info = &guest_info_state->info;
- guest_info->ram_size = below_4g_mem_size + above_4g_mem_size;
- guest_info->apic_id_limit = pc_apic_id_limit(max_cpus);
- guest_info->apic_xrupt_override = kvm_allows_irq0_override();
- guest_info->numa_nodes = nb_numa_nodes;
- guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes *
sizeof *guest_info->node_mem);- guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit *
sizeof *guest_info->node_mem);This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
I don't know which part of the RFC thread still applied and which doesn't: at that point you were rejecting the whole approach.
I found a mail where you said: I'd be a lot happier if we were passing more information to this routine and not hard coding it. For instance, the PCI interrupt assignments, the APIC ids, the number of available CPUs, etc.
So this is exactly what this code does. What, exactly, would you like to see instead? Create a guest info QOM object, and encode all information used by ACPI generation as properties of this object?
- memset(&guest_info->found_cpus, 0, sizeof guest_info->found_cpus);
- qemu_for_each_cpu(pc_set_cpu_guest_info, guest_info);
- guest_info->pci_info.w32.end = IO_APIC_DEFAULT_ADDRESS; if (sizeof(hwaddr) == 4) { guest_info->pci_info.w64.begin = 0;
@@ -1204,7 +1237,8 @@ static const MemoryRegionOps ioportF0_io_ops = { void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy,
bool no_vmport)
bool no_vmport,PcGuestInfo *guest_info){ int i; DriveInfo *fd[MAX_FD]; @@ -1230,7 +1264,10 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, * Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT * when the HPET wants to take over. Thus we have to disable the latter. */
- if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {
guest_info->has_hpet = !no_hpet &&
(!kvm_irqchip_in_kernel() || kvm_has_pit_state2());if (guest_info->has_hpet) { hpet = sysbus_try_create_simple("hpet", HPET_BASE, NULL);
if (hpet) {diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ecd1490..3c2541a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,6 +50,8 @@ # include <xen/hvm/hvm_info_table.h> #endif
+#include "hw/i386/acpi-dsdt.hex"
#define MAX_IDE_BUS 2
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -122,6 +124,10 @@ static void pc_init1(MemoryRegion *system_memory, }
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
guest_info->dsdt_code = AcpiDsdtAmlCode;
guest_info->dsdt_size = sizeof AcpiDsdtAmlCode;
guest_info->has_pci_info = has_pci_info;
/* Set PCI window size the way seabios has always done it. */
@@ -190,7 +196,8 @@ static void pc_init1(MemoryRegion *system_memory, pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(),
guest_info);pc_nic_init(isa_bus, pci_bus);
@@ -229,7 +236,9 @@ static void pc_init1(MemoryRegion *system_memory, /* TODO: Populate SPD eeprom data. */ smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, gsi[9], *smi_irq,
kvm_enabled(), fw_cfg);
kvm_enabled(), fw_cfg,guest_info);guest_info->sci_int = 9; smbus_eeprom_init(smbus, 8, NULL, 0);@@ -238,7 +247,7 @@ static void pc_init1(MemoryRegion *system_memory, }
if (has_pvpanic) {
pvpanic_init(isa_bus);
pvpanic_init(isa_bus, guest_info);}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5b92160..50afe7c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -43,6 +43,8 @@ #include "hw/usb.h" #include "hw/cpu/icc_bus.h"
+#include "hw/i386/q35-acpi-dsdt.hex"
/* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6
@@ -109,6 +111,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info;
guest_info->dsdt_code = Q35AcpiDsdtAmlCode;
guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
/* allocate ram and load rom/bios */ if (!xen_enabled()) {
@@ -175,10 +179,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_register_ferr_irq(gsi[13]);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false);
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, guest_info);
/* connect pm stuff to lpc */
- ich9_lpc_pm_init(lpc);
ich9_lpc_pm_init(lpc, guest_info);
/* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = pci_create_simple_multifunction(host_bus,
@@ -210,7 +214,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) }
if (has_pvpanic) {
pvpanic_init(isa_bus);
pvpanic_init(isa_bus, guest_info);}
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 667e882..a742fcb 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -312,6 +312,13 @@ PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin) return route; }
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info) +{
- guest_info->sci_int = 9;
- guest_info->acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
- guest_info->acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
+}
static int ich9_lpc_sci_irq(ICH9LPCState *lpc) { switch (lpc->d.config[ICH9_LPC_ACPI_CTRL] & @@ -356,13 +363,13 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) } }
-void ich9_lpc_pm_init(PCIDevice *lpc_pci) +void ich9_lpc_pm_init(PCIDevice *lpc_pci, PcGuestInfo *guest_info) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci); qemu_irq *sci_irq;
sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1);
- ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]);
ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0], guest_info);
ich9_lpc_reset(&lpc->d.qdev);
} diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 5843fad..b95597c 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -964,7 +964,7 @@ void mips_malta_init(QEMUMachineInitArgs *args) pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
isa_get_irq(NULL, 9), NULL, 0, NULL);
isa_get_irq(NULL, 9), NULL, 0, NULL, NULL);diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 792d8e4..7af713a 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -101,25 +101,27 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(d, &s->io, s->ioport); }
-static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg) +static void pvpanic_guest_info(ISADevice *dev, PcGuestInfo *guest_info) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); uint16_t *pvpanic_port = g_malloc(sizeof(*pvpanic_port)); *pvpanic_port = cpu_to_le16(s->ioport);
- fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
- fw_cfg_add_file(guest_info->fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port));
- guest_info->pvpanic_port = s->ioport;
}
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
static Property pvpanic_isa_properties[] = { diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 13148ed..667bd20 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -260,6 +260,7 @@ static int mch_init(PCIDevice *d) */ mch->guest_info->pci_info.w32.begin = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT + MCH_HOST_BRIDGE_PCIEXBAR_MAX;
mch->guest_info->mcfg_base = MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT;
/* setup pci memory regions */ memory_region_init_alias(&mch->pci_hole, "pci-hole",
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index b1fe71f..66ab31a 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -45,7 +45,7 @@ typedef struct ICH9LPCPMRegs { } ICH9LPCPMRegs;
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
qemu_irq sci_irq);
qemu_irq sci_irq, PcGuestInfo *guest_info);void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base); extern const VMStateDescription vmstate_ich9_pm;
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index c5f637b..7428452 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -15,10 +15,11 @@ #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h"
+void ich9_lpc_set_guest_info(PcGuestInfo *guest_info); void ich9_lpc_set_irq(void *opaque, int irq_num, int level); int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx); PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin); -void ich9_lpc_pm_init(PCIDevice *pci_lpc); +void ich9_lpc_pm_init(PCIDevice *pci_lpc, PcGuestInfo *guest_info); PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus); i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 56f2e41..b29c8f6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -10,6 +10,9 @@ #include "hw/i386/ioapic.h"
#include "qemu/range.h" +#include "qemu/bitmap.h" +#include "sysemu/sysemu.h" +#include "hw/pci/pci.h"
/* PC-style peripherals (also used by other machines). */
@@ -18,9 +21,35 @@ typedef struct PcPciInfo { Range w64; } PcPciInfo;
+/* Matches the value hard-coded in BIOS */ +#define PC_GUEST_PORT_ACPI_PM_BASE 0xb000
struct PcGuestInfo { PcPciInfo pci_info; bool has_pci_info;
- hwaddr ram_size;
- unsigned apic_id_limit;
- bool apic_xrupt_override;
- bool has_hpet;
- uint64_t numa_nodes;
- uint64_t *node_mem;
- uint64_t *node_cpu;
- DECLARE_BITMAP(found_cpus, MAX_CPUMASK_BITS + 1);
- bool s3_disabled;
- bool s4_disabled;
- uint8_t s4_val;
- DECLARE_BITMAP(slot_hotplug_enable, PCI_SLOT_MAX);
- uint16_t sci_int;
- uint8_t acpi_enable_cmd;
- uint8_t acpi_disable_cmd;
- uint32_t gpe0_blk;
- uint32_t gpe0_blk_len;
- bool fix_rtc;
- bool platform_timer;
- uint64_t mcfg_base;
- const unsigned char *dsdt_code;
- unsigned dsdt_size;
- uint16_t pvpanic_port;
This is all stuff that should be obtained via QOM.
Doing it this way just makes it all that much harder to detangle the PC initialization mess we already have.
Again, what do you mean exactly? Would you like code in acpi-build to poke at devicestate structures of random devices?
Regards,
Anthony Liguori
FWCfgState *fw_cfg;};
@@ -114,7 +143,8 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy,
bool no_vmport);
bool no_vmport,PcGuestInfo *guest_info);void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, @@ -132,7 +162,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg);
int kvm_enabled, FWCfgState *fw_cfg,PcGuestInfo *guest_info);void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
/* hpet.c */ @@ -194,7 +225,7 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) void pc_system_firmware_init(MemoryRegion *rom_memory);
/* pvpanic.c */ -void pvpanic_init(ISABus *bus); +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info);
/* e820 types */
#define E820_RAM 1
MST
SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
Hi,
This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
I don't know which part of the RFC thread still applied and which doesn't: at that point you were rejecting the whole approach.
I found a mail where you said: I'd be a lot happier if we were passing more information to this routine and not hard coding it. For instance, the PCI interrupt assignments, the APIC ids, the number of available CPUs, etc.
So this is exactly what this code does. What, exactly, would you like to see instead? Create a guest info QOM object, and encode all information used by ACPI generation as properties of this object?
Don't touch device code for this.
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
To pick this one as example: Instead of patching pvpanic code to stuff config info into GuestInfo you should (1) search the device object tree for a pvpanic device and (b) if present read the ioport property to figure the base address.
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
I'd tend to accept GuestInfo as temporary thing for stuff which can't be figured using qom properties today. Anthony might disagree though.
cheers, Gerd
Hi Gerd,
Am 24.07.2013 16:42, schrieb Gerd Hoffmann:
This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
I don't know which part of the RFC thread still applied and which doesn't: at that point you were rejecting the whole approach.
I found a mail where you said: I'd be a lot happier if we were passing more information to this routine and not hard coding it. For instance, the PCI interrupt assignments, the APIC ids, the number of available CPUs, etc.
So this is exactly what this code does. What, exactly, would you like to see instead? Create a guest info QOM object, and encode all information used by ACPI generation as properties of this object?
Don't touch device code for this.
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
To pick this one as example: Instead of patching pvpanic code to stuff config info into GuestInfo you should (1) search the device object tree for a pvpanic device and (b) if present read the ioport property to figure the base address.
Yeah, the above does not feel so nice from a QOM view (didn't review the ACPI series yet).
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
Not sure what's needed here? object_resolve_path() and object_foreach_child() come to mind...
Regards, Andreas
I'd tend to accept GuestInfo as temporary thing for stuff which can't be figured using qom properties today. Anthony might disagree though.
cheers, Gerd
Hi,
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
Not sure what's needed here? object_resolve_path() and object_foreach_child() come to mind...
object_resolve_path should do to (a) figure whenever we are i440fx or q35 and (b) get the pcihost device (then read enable_s3 etc properties).
For pvpanic (and maybe others) it might be handy to have "find me the device of type TYPE_ISA_PVPANIC_DEVICE, anywhere in the tree" functionality, so the same code works no matter where the isa bridge happens to live. Or "find me all pci bridges in the system".
Is object_foreach_child recursive? Then it might do the job ...
cheers, Gerd
Hi,
Am 24.07.2013 17:04, schrieb Gerd Hoffmann:
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
Not sure what's needed here? object_resolve_path() and object_foreach_child() come to mind...
object_resolve_path should do to (a) figure whenever we are i440fx or q35 and (b) get the pcihost device (then read enable_s3 etc properties).
For pvpanic (and maybe others) it might be handy to have "find me the device of type TYPE_ISA_PVPANIC_DEVICE, anywhere in the tree" functionality, so the same code works no matter where the isa bridge happens to live. Or "find me all pci bridges in the system".
I think Paolo used object_resolve_path_type("", TYPE_...) for that somewhere in audio code.
Is object_foreach_child recursive? Then it might do the job ...
No, recursion would need to be implemented in the callback - my recent recursive QOM realization series had an example of a deep search for devices.
Regards, Andreas
Il 24/07/2013 17:09, Andreas Färber ha scritto:
Hi,
Am 24.07.2013 17:04, schrieb Gerd Hoffmann:
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
Not sure what's needed here? object_resolve_path() and object_foreach_child() come to mind...
object_resolve_path should do to (a) figure whenever we are i440fx or q35 and (b) get the pcihost device (then read enable_s3 etc properties).
For pvpanic (and maybe others) it might be handy to have "find me the device of type TYPE_ISA_PVPANIC_DEVICE, anywhere in the tree" functionality, so the same code works no matter where the isa bridge happens to live. Or "find me all pci bridges in the system".
I think Paolo used object_resolve_path_type("", TYPE_...) for that somewhere in audio code.
Yes. It returns NULL if there is more than one device, but in some cases it may be exactly what you want...
Paolo
Is object_foreach_child recursive? Then it might do the job ...
No, recursion would need to be implemented in the callback - my recent recursive QOM realization series had an example of a deep search for devices.
Regards, Andreas
On Wed, Jul 24, 2013 at 04:52:05PM +0200, Andreas Färber wrote:
Hi Gerd,
Am 24.07.2013 16:42, schrieb Gerd Hoffmann:
This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
I don't know which part of the RFC thread still applied and which doesn't: at that point you were rejecting the whole approach.
I found a mail where you said: I'd be a lot happier if we were passing more information to this routine and not hard coding it. For instance, the PCI interrupt assignments, the APIC ids, the number of available CPUs, etc.
So this is exactly what this code does. What, exactly, would you like to see instead? Create a guest info QOM object, and encode all information used by ACPI generation as properties of this object?
Don't touch device code for this.
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
To pick this one as example: Instead of patching pvpanic code to stuff config info into GuestInfo you should (1) search the device object tree for a pvpanic device and (b) if present read the ioport property to figure the base address.
Yeah, the above does not feel so nice from a QOM view (didn't review the ACPI series yet).
If you do please review v3 which was just posted. It should address your comment - though long term, it would be nicer if we had multiple inheritance for interfaces, then we could expose a generic panic interface with the io port number, avoid need to poke at specific device.
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
Not sure what's needed here? object_resolve_path() and object_foreach_child() come to mind...
Regards, Andreas
I'd tend to accept GuestInfo as temporary thing for stuff which can't be figured using qom properties today. Anthony might disagree though.
cheers, Gerd
-- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
On Wed, Jul 24, 2013 at 04:42:08PM +0200, Gerd Hoffmann wrote:
Hi,
This does not satisfy the "should use QOM properties" requirement that we discussed in the RFC thread.
I don't know which part of the RFC thread still applied and which doesn't: at that point you were rejecting the whole approach.
I found a mail where you said: I'd be a lot happier if we were passing more information to this routine and not hard coding it. For instance, the PCI interrupt assignments, the APIC ids, the number of available CPUs, etc.
So this is exactly what this code does. What, exactly, would you like to see instead? Create a guest info QOM object, and encode all information used by ACPI generation as properties of this object?
Don't touch device code for this.
-void pvpanic_init(ISABus *bus) +void pvpanic_init(ISABus *bus, PcGuestInfo *guest_info) { ISADevice *dev;
- FWCfgState *fw_cfg = fw_cfg_find();
- FWCfgState *fw_cfg = guest_info->fw_cfg; if (!fw_cfg) { return; } dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
- pvpanic_fw_cfg(dev, fw_cfg);
- pvpanic_guest_info(dev, guest_info);
}
To pick this one as example: Instead of patching pvpanic code to stuff config info into GuestInfo you should (1) search the device object tree for a pvpanic device and (b) if present read the ioport property to figure the base address.
/me suggests to check out qmp_qom_get() in qmp.c. Some qom aequivalent for qdev_find_recursive would be handy, dunno whenever such a thing exists already, Andreas?
I'd tend to accept GuestInfo as temporary thing for stuff which can't be figured using qom properties today. Anthony might disagree though.
cheers, Gerd
That's exactly what I implemented, with APIs so that we don't expose structure internals and path names to all the world. Will post soon.
This adds C code for generating ACPI tables at runtime, imported from seabios git tree commit 51684b7ced75fb76776e8ee84833fcfb6ecf12dd
Although ACPI tables come from a system BIOS on real hw, it makes sense that the ACPI tables are coupled with the virtual machine, since they have to abstract the x86 machine to the OS's.
This is widely desired as a way to avoid the churn and proliferation of QEMU-specific interfaces associated with ACPI tables in bios code.
Notes: The code structure was intentionally kept as close to the seabios original as possible, to simplify comparison and making sure we didn't lose anything in translation.
Minor code duplication results, to help ensure there are no functional regressions, I think it's better to merge it like this and do more code changes in follow-up patches.
Cross-version compatibility concerns have been addressed: ACPI tables are exposed to guest as FW_CFG entries. When running with -M 1.5 and older, this patch disables ACPI table generation, and doesn't expose ACPI tables to guest.
As table content is likely to change over time, the following measures are taken to simplify cross-version migration: - All tables besides the RSDP are packed in a single FW CFG entry. This entry size is currently 23K. We round it up to 64K to avoid too much churn there. - Tables are placed in special ROM blob (not mapped into guest memory) which is automatically migrated together with the guest, same as BIOS code.
This patch reuses some code from SeaBIOS, which was originally under LGPLv2 and then relicensed to GPLv3 or LGPLv3, in QEMU under GPLv2+. This relicensing has been acked by all contributors that had contributed to the code since the v2->v3 relicense. ACKs approving the v2+ relicensing are listed below. The list might include ACKs from people not holding copyright on any parts of the reused code, but it's better to err on the side of caution and include them.
Affected SeaBIOS files (GPLv2+ license headers added) http://thread.gmane.org/gmane.comp.bios.coreboot.seabios/5949:
src/acpi-dsdt-cpu-hotplug.dsl src/acpi-dsdt-dbug.dsl src/acpi-dsdt-hpet.dsl src/acpi-dsdt-isa.dsl src/acpi-dsdt-pci-crs.dsl src/acpi.c src/acpi.h src/ssdt-misc.dsl src/ssdt-pcihp.dsl src/ssdt-proc.dsl tools/acpi_extract.py tools/acpi_extract_preprocess.py
Each one of the listed people agreed to the following:
If you allow the use of your contribution in QEMU under the terms of GPLv2 or later as proposed by this patch, please respond to this mail including the line:
Acked-by: Name <email address>
Acked-by: Gerd Hoffmann kraxel@redhat.com Acked-by: Jan Kiszka jan.kiszka@siemens.com Acked-by: Jason Baron jbaron@akamai.com Acked-by: David Woodhouse David.Woodhouse@intel.com Acked-by: Gleb Natapov gleb@redhat.com Acked-by: Marcelo Tosatti mtosatti@redhat.com Acked-by: Dave Frodin dave.frodin@se-eng.com Acked-by: Paolo Bonzini pbonzini@redhat.com Acked-by: Kevin O'Connor kevin@koconnor.net Acked-by: Laszlo Ersek lersek@redhat.com Acked-by: Kenji Kaneshige kaneshige.kenji@jp.fujitsu.com Acked-by: Isaku Yamahata yamahata@valinux.co.jp Acked-by: Magnus Christensson magnus.christensson@intel.com Acked-by: Hu Tao hutao@cn.fujitsu.com Acked-by: Eduardo Habkost ehabkost@redhat.com
Signed-off-by: Michael S. Tsirkin mst@redhat.com --- hw/i386/Makefile.objs | 2 + hw/i386/acpi-build.c | 723 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-defs.h | 327 +++++++++++++++++++ hw/i386/pc.c | 2 + hw/i386/pc_piix.c | 3 + hw/i386/pc_q35.c | 3 + hw/i386/ssdt-misc.dsl | 46 +++ include/hw/i386/acpi-build.h | 9 + include/hw/i386/pc.h | 1 + 9 files changed, 1116 insertions(+) create mode 100644 hw/i386/acpi-build.c create mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/i386/acpi-build.h
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index e783050..2ab2572 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,7 +4,9 @@ obj-y += pc.o pc_piix.o pc_q35.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o +obj-y += acpi-build.o obj-y += bios-linker-loader.o +hw/i386/acpi-build.o: hw/i386/acpi-build.c hw/i386/acpi-dsdt.hex hw/i386/ssdt-proc.hex hw/i386/ssdt-pcihp.hex hw/i386/ssdt-misc.hex hw/i386/q35-acpi-dsdt.hex hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c new file mode 100644 index 0000000..bc44f95 --- /dev/null +++ b/hw/i386/acpi-build.c @@ -0,0 +1,723 @@ +/* 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 "hw/i386/acpi-build.h" +#include <stddef.h> +#include <glib.h> +#include "qemu/bitmap.h" +#include "qemu/range.h" +#include "hw/pci/pci.h" +#include "qom/cpu.h" +#include "hw/i386/pc.h" +#include "target-i386/cpu.h" +#include "hw/timer/hpet.h" +#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/i386/bios-linker-loader.h" +#include "hw/loader.h" + +#define ACPI_BUILD_APPNAME "Bochs" +#define ACPI_BUILD_APPNAME6 "BOCHS " +#define ACPI_BUILD_APPNAME4 "BXPC" + +#define ACPI_BUILD_DPRINTF(level, fmt, ...) do {} while(0) + +#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables" +#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp" + +static void +build_header(GArray *linker, GArray *table_data, + AcpiTableHeader *h, uint32_t sig, int len, uint8_t rev) +{ + h->signature = cpu_to_le32(sig); + h->length = cpu_to_le32(len); + h->revision = rev; + memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6); + memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4); + memcpy(h->oem_table_id + 4, (void*)&sig, 4); + h->oem_revision = cpu_to_le32(1); + memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4); + h->asl_compiler_revision = cpu_to_le32(1); + h->checksum = 0; + /* Checksum to be filled in by Guest linker */ + bios_linker_add_checksum(linker, ACPI_BUILD_TABLE_FILE, + table_data->data, h, len, &h->checksum); +} + +#define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT */ +#define ACPI_PORT_PM_BASE 0xb000 + +static inline void *acpi_data_push(GArray *table_data, unsigned size) +{ + unsigned off = table_data->len; + g_array_set_size(table_data, off + size); + return table_data->data + off; +} + +static unsigned acpi_data_len(GArray *table) +{ + return table->len * g_array_get_element_size(table); +} + +static inline void acpi_add_table(GArray *table_offsets, GArray *table_data) +{ + uint32_t offset = cpu_to_le32(table_data->len); + g_array_append_val(table_offsets, offset); +} + +/* FACS */ +static void +build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{ + AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs); + facs->signature = cpu_to_le32(ACPI_FACS_SIGNATURE); + facs->length = cpu_to_le32(sizeof(*facs)); +} + +/* Load chipset information into FADT */ +static void fadt_setup(AcpiFadtDescriptorRev1 *fadt, PcGuestInfo *guest_info) +{ + fadt->model = 1; + fadt->reserved1 = 0; + fadt->sci_int = cpu_to_le16(guest_info->sci_int); + fadt->smi_cmd = cpu_to_le32(ACPI_PORT_SMI_CMD); + fadt->acpi_enable = guest_info->acpi_enable_cmd; + fadt->acpi_disable = guest_info->acpi_disable_cmd; + fadt->pm1a_evt_blk = cpu_to_le32(ACPI_PORT_PM_BASE); + fadt->pm1a_cnt_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x04); + fadt->pm_tmr_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x08); + fadt->gpe0_blk = cpu_to_le32(guest_info->gpe0_blk); + fadt->pm1_evt_len = 4; + fadt->pm1_cnt_len = 2; + fadt->pm_tmr_len = 4; + fadt->gpe0_blk_len = guest_info->gpe0_blk_len; + fadt->plvl2_lat = cpu_to_le16(0xfff); /* C2 state not supported */ + fadt->plvl3_lat = cpu_to_le16(0xfff); /* C3 state not supported */ + fadt->flags = cpu_to_le32((1 << ACPI_FADT_F_WBINVD) | + (1 << ACPI_FADT_F_PROC_C1) | + (1 << ACPI_FADT_F_SLP_BUTTON) | + (1 << ACPI_FADT_F_RTC_S4)); + if (guest_info->fix_rtc) { + fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_FIX_RTC); + } + if (guest_info->platform_timer) { + fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_USE_PLATFORM_CLOCK); + } +} + + +/* FADT */ +static void +build_fadt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info, + unsigned facs, unsigned dsdt) +{ + AcpiFadtDescriptorRev1 *fadt = acpi_data_push(table_data, sizeof(*fadt)); + + fadt->firmware_ctrl = cpu_to_le32(facs); + /* FACS address to be filled by Guest linker */ + bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE, + table_data, &fadt->firmware_ctrl, + sizeof fadt->firmware_ctrl); + + fadt->dsdt = cpu_to_le32(dsdt); + /* DSDT address to be filled by Guest linker */ + bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE, + table_data, &fadt->dsdt, + sizeof fadt->dsdt); + + fadt_setup(fadt, guest_info); + + build_header(linker, table_data, + (void*)fadt, ACPI_FACP_SIGNATURE, sizeof(*fadt), 1); +} + +static void +build_madt(GArray *table_data, GArray *linker, FWCfgState *fw_cfg, PcGuestInfo *guest_info) +{ + int madt_size; + + AcpiMultipleApicTable *madt; + AcpiMadtProcessorApic *apic; + AcpiMadtIoApic *io_apic; + AcpiMadtIntsrcovr *intsrcovr; + AcpiMadtLocalNmi *local_nmi; + + madt_size = (sizeof(AcpiMultipleApicTable) + + sizeof(AcpiMadtProcessorApic) * guest_info->apic_id_limit + + sizeof(AcpiMadtIoApic) + + sizeof(AcpiMadtIntsrcovr) * 16 + + sizeof(AcpiMadtLocalNmi)); + madt = acpi_data_push(table_data, madt_size); + madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS); + madt->flags = cpu_to_le32(1); + apic = (void*)&madt[1]; + int i; + for (i=0; i < guest_info->apic_id_limit; i++) { + apic->type = ACPI_APIC_PROCESSOR; + apic->length = sizeof(*apic); + apic->processor_id = i; + apic->local_apic_id = i; + if (test_bit(i, guest_info->found_cpus)) + apic->flags = cpu_to_le32(1); + else + apic->flags = cpu_to_le32(0); + apic++; + } + io_apic = (void*)apic; + io_apic->type = ACPI_APIC_IO; + io_apic->length = sizeof(*io_apic); +#define ACPI_BUILD_IOAPIC_ID 0x0 + 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); + + intsrcovr = (void*)&io_apic[1]; + if (guest_info->apic_xrupt_override) { + memset(intsrcovr, 0, 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 */ + intsrcovr++; + } + 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; + memset(intsrcovr, 0, 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 */ + intsrcovr++; + } + + local_nmi = (void*)intsrcovr; + 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 */ + local_nmi++; + + build_header(linker, table_data, + (void*)madt, ACPI_APIC_SIGNATURE, + (void*)local_nmi - (void*)madt, 1); +} + +/* Encode a hex value */ +static inline char acpi_get_hex(uint32_t val) { + val &= 0x0f; + return (val <= 9) ? ('0' + val) : ('A' + val - 10); +} + +/* Encode a length in an SSDT. */ +static uint8_t * +acpi_encode_len(uint8_t *ssdt_ptr, int length, int bytes) +{ + switch (bytes) { + default: + case 4: ssdt_ptr[3] = ((length >> 20) & 0xff); + case 3: ssdt_ptr[2] = ((length >> 12) & 0xff); + case 2: ssdt_ptr[1] = ((length >> 4) & 0xff); + ssdt_ptr[0] = (((bytes - 1) & 0x3) << 6) | (length & 0x0f); + break; + case 1: ssdt_ptr[0] = length & 0x3f; + } + return ssdt_ptr + bytes; +} + +#include "hw/i386/ssdt-proc.hex" + +/* 0x5B 0x83 ProcessorOp PkgLength NameString ProcID */ +#define ACPI_PROC_OFFSET_CPUHEX (*ssdt_proc_name - *ssdt_proc_start + 2) +#define ACPI_PROC_OFFSET_CPUID1 (*ssdt_proc_name - *ssdt_proc_start + 4) +#define ACPI_PROC_OFFSET_CPUID2 (*ssdt_proc_id - *ssdt_proc_start) +#define ACPI_PROC_SIZEOF (*ssdt_proc_end - *ssdt_proc_start) +#define ACPI_PROC_AML (ssdp_proc_aml + *ssdt_proc_start) + +/* 0x5B 0x82 DeviceOp PkgLength NameString */ +#define ACPI_PCIHP_OFFSET_HEX (*ssdt_pcihp_name - *ssdt_pcihp_start + 1) +#define ACPI_PCIHP_OFFSET_ID (*ssdt_pcihp_id - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_ADR (*ssdt_pcihp_adr - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_EJ0 (*ssdt_pcihp_ej0 - *ssdt_pcihp_start) +#define ACPI_PCIHP_SIZEOF (*ssdt_pcihp_end - *ssdt_pcihp_start) +#define ACPI_PCIHP_AML (ssdp_pcihp_aml + *ssdt_pcihp_start) + +#define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */ +#define ACPI_SSDT_HEADER_LENGTH 36 + +#include "hw/i386/ssdt-misc.hex" +#include "hw/i386/ssdt-pcihp.hex" + +static uint8_t* +build_notify(uint8_t *ssdt_ptr, const char *name, int skip, int count, + const char *target, int ofs) +{ + int i; + + count -= skip; + + *(ssdt_ptr++) = 0x14; /* MethodOp */ + ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+5+(12*count), 2); + memcpy(ssdt_ptr, name, 4); + ssdt_ptr += 4; + *(ssdt_ptr++) = 0x02; /* MethodOp */ + + for (i = skip; count-- > 0; i++) { + *(ssdt_ptr++) = 0xA0; /* IfOp */ + ssdt_ptr = acpi_encode_len(ssdt_ptr, 11, 1); + *(ssdt_ptr++) = 0x93; /* LEqualOp */ + *(ssdt_ptr++) = 0x68; /* Arg0Op */ + *(ssdt_ptr++) = 0x0A; /* BytePrefix */ + *(ssdt_ptr++) = i; + *(ssdt_ptr++) = 0x86; /* NotifyOp */ + memcpy(ssdt_ptr, target, 4); + ssdt_ptr[ofs] = acpi_get_hex(i >> 4); + ssdt_ptr[ofs + 1] = acpi_get_hex(i); + ssdt_ptr += 4; + *(ssdt_ptr++) = 0x69; /* Arg1Op */ + } + return ssdt_ptr; +} + +static void patch_pcihp(int slot, uint8_t *ssdt_ptr, uint32_t eject) +{ + ssdt_ptr[ACPI_PCIHP_OFFSET_HEX] = acpi_get_hex(slot >> 4); + ssdt_ptr[ACPI_PCIHP_OFFSET_HEX+1] = acpi_get_hex(slot); + ssdt_ptr[ACPI_PCIHP_OFFSET_ID] = slot; + ssdt_ptr[ACPI_PCIHP_OFFSET_ADR + 2] = slot; + + /* Runtime patching of ACPI_EJ0: to disable hotplug for a slot, + * replace the method name: _EJ0 by ACPI_EJ0_. */ + /* Sanity check */ + assert (!memcmp(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "_EJ0", 4)); + + if (!eject) { + memcpy(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "EJ0_", 4); + } +} + +static void +build_ssdt(GArray *table_data, GArray *linker, + FWCfgState *fw_cfg, PcGuestInfo *guest_info) +{ + int acpi_cpus = MIN(0xff, guest_info->apic_id_limit); + int length = (sizeof(ssdp_misc_aml) /* _S3_ / _S4_ / _S5_ */ + + (1+3+4) /* Scope(_SB_) */ + + (acpi_cpus * ACPI_PROC_SIZEOF) /* procs */ + + (1+2+5+(12*acpi_cpus)) /* NTFY */ + + (6+2+1+(1*acpi_cpus)) /* CPON */ + + (1+3+4) /* Scope(PCI0) */ + + ((PCI_SLOT_MAX - 1) * ACPI_PCIHP_SIZEOF) /* slots */ + + (1+2+5+(12*(PCI_SLOT_MAX - 1)))); /* PCNT */ + uint8_t *ssdt = acpi_data_push(table_data, length); + uint8_t *ssdt_ptr = ssdt; + + /* Copy header and encode fwcfg values in the S3_ / S4_ / S5_ packages */ + memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml)); + if (guest_info->s3_disabled) { + ssdt_ptr[acpi_s3_name[0]] = 'X'; + } + if (guest_info->s4_disabled) { + ssdt_ptr[acpi_s4_name[0]] = 'X'; + } else { + ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt[acpi_s4_pkg[0] + 3] = + guest_info->s4_val; + } + + *(uint32_t*)&ssdt_ptr[acpi_pci32_start[0]] = + cpu_to_le32(guest_info->pci_info.w32.begin); + *(uint32_t*)&ssdt_ptr[acpi_pci32_end[0]] = + cpu_to_le32(guest_info->pci_info.w32.end - 1); + + if (guest_info->pci_info.w64.end > guest_info->pci_info.w64.begin) { + ssdt_ptr[acpi_pci64_valid[0]] = 1; + *(uint64_t*)&ssdt_ptr[acpi_pci64_start[0]] = + cpu_to_le64(guest_info->pci_info.w64.begin); + *(uint64_t*)&ssdt_ptr[acpi_pci64_end[0]] = + cpu_to_le64(guest_info->pci_info.w64.end - 1); + *(uint64_t*)&ssdt_ptr[acpi_pci64_length[0]] = + cpu_to_le64(guest_info->pci_info.w64.end - + guest_info->pci_info.w64.begin); + } else { + ssdt_ptr[acpi_pci64_valid[0]] = 0; + } + + *(uint16_t *)(ssdt_ptr + *ssdt_isa_pest) = + cpu_to_le16(guest_info->pvpanic_port); + + ssdt_ptr += sizeof(ssdp_misc_aml); + + /* build Scope(_SB_) header */ + *(ssdt_ptr++) = 0x10; /* ScopeOp */ + ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3); + *(ssdt_ptr++) = '_'; + *(ssdt_ptr++) = 'S'; + *(ssdt_ptr++) = 'B'; + *(ssdt_ptr++) = '_'; + + /* build Processor object for each processor */ + int i; + for (i=0; i<acpi_cpus; i++) { + memcpy(ssdt_ptr, ACPI_PROC_AML, ACPI_PROC_SIZEOF); + ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX] = acpi_get_hex(i >> 4); + ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX+1] = acpi_get_hex(i); + ssdt_ptr[ACPI_PROC_OFFSET_CPUID1] = i; + ssdt_ptr[ACPI_PROC_OFFSET_CPUID2] = i; + ssdt_ptr += ACPI_PROC_SIZEOF; + } + + /* build "Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...}" */ + /* Arg0 = Processor ID = APIC ID */ + ssdt_ptr = build_notify(ssdt_ptr, "NTFY", 0, acpi_cpus, "CP00", 2); + + /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" */ + *(ssdt_ptr++) = 0x08; /* NameOp */ + *(ssdt_ptr++) = 'C'; + *(ssdt_ptr++) = 'P'; + *(ssdt_ptr++) = 'O'; + *(ssdt_ptr++) = 'N'; + *(ssdt_ptr++) = 0x12; /* PackageOp */ + ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+1+(1*acpi_cpus), 2); + *(ssdt_ptr++) = acpi_cpus; + for (i=0; i<acpi_cpus; i++) + *(ssdt_ptr++) = (test_bit(i, guest_info->found_cpus)) ? 0x01 : 0x00; + + /* build Scope(PCI0) opcode */ + *(ssdt_ptr++) = 0x10; /* ScopeOp */ + ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3); + *(ssdt_ptr++) = 'P'; + *(ssdt_ptr++) = 'C'; + *(ssdt_ptr++) = 'I'; + *(ssdt_ptr++) = '0'; + + /* build Device object for each slot */ + for (i = 1; i < PCI_SLOT_MAX; i++) { + bool eject = test_bit(i, guest_info->slot_hotplug_enable); + memcpy(ssdt_ptr, ACPI_PCIHP_AML, ACPI_PCIHP_SIZEOF); + patch_pcihp(i, ssdt_ptr, eject); + ssdt_ptr += ACPI_PCIHP_SIZEOF; + } + + ssdt_ptr = build_notify(ssdt_ptr, "PCNT", 1, PCI_SLOT_MAX, "S00_", 1); + + build_header(linker, table_data, + (void*)ssdt, ACPI_SSDT_SIGNATURE, ssdt_ptr - ssdt, 1); +} + +static void +build_hpet(GArray *table_data, GArray *linker) +{ + Acpi20Hpet *hpet; + + hpet = acpi_data_push(table_data, sizeof(*hpet)); + /* Note timer_block_id value must be kept in sync with value advertised by + * emulated hpet + */ + hpet->timer_block_id = cpu_to_le32(0x8086a201); + hpet->addr.address = cpu_to_le64(HPET_BASE); + build_header(linker, table_data, + (void*)hpet, ACPI_HPET_SIGNATURE, sizeof(*hpet), 1); +} + +static void +acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, + uint64_t base, uint64_t len, int node, int enabled) +{ + numamem->type = ACPI_SRAT_MEMORY; + numamem->length = sizeof(*numamem); + memset(numamem->proximity, 0, 4); + numamem->proximity[0] = node; + numamem->flags = cpu_to_le32(!!enabled); + numamem->base_addr = cpu_to_le64(base); + numamem->range_length = cpu_to_le64(len); +} + +static void +build_srat(GArray *table_data, GArray *linker, + FWCfgState *fw_cfg, PcGuestInfo *guest_info) +{ + AcpiSystemResourceAffinityTable *srat; + AcpiSratProcessorAffinity *core; + AcpiSratMemoryAffinity *numamem; + + int i; + uint64_t curnode; + int srat_size; + int slots; + uint64_t mem_len, mem_base, next_base; + + srat_size = sizeof(*srat) + + sizeof(AcpiSratProcessorAffinity) * guest_info->apic_id_limit + + sizeof(AcpiSratMemoryAffinity) * (guest_info->numa_nodes + 2); + + srat = acpi_data_push(table_data, srat_size); + srat->reserved1 = cpu_to_le32(1); + core = (void*)(srat + 1); + + for (i = 0; i < guest_info->apic_id_limit; ++i) { + core->type = ACPI_SRAT_PROCESSOR; + core->length = sizeof(*core); + core->local_apic_id = i; + curnode = guest_info->node_cpu[i]; + core->proximity_lo = curnode; + memset(core->proximity_hi, 0, 3); + core->local_sapic_eid = 0; + if (test_bit(i, guest_info->found_cpus)) + core->flags = cpu_to_le32(1); + else + core->flags = cpu_to_le32(0); + core++; + } + + + /* the memory map is a bit tricky, it contains at least one hole + * from 640k-1M and possibly another one from 3.5G-4G. + */ + numamem = (void*)core; + slots = 0; + next_base = 0; + + acpi_build_srat_memory(numamem, 0, 640*1024, 0, 1); + next_base = 1024 * 1024; + numamem++; + slots++; + for (i = 1; i < guest_info->numa_nodes + 1; ++i) { + mem_base = next_base; + mem_len = guest_info->node_mem[i - 1]; + if (i == 1) + mem_len -= 1024 * 1024; + next_base = mem_base + mem_len; + + /* Cut out the ACPI_PCI hole */ + if (mem_base <= guest_info->ram_size && + next_base > guest_info->ram_size) { + mem_len -= next_base - guest_info->ram_size; + if (mem_len > 0) { + acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1); + numamem++; + slots++; + } + mem_base = 1ULL << 32; + mem_len = next_base - guest_info->ram_size; + next_base += (1ULL << 32) - guest_info->ram_size; + } + acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1); + numamem++; + slots++; + } + for (; slots < guest_info->numa_nodes + 2; slots++) { + acpi_build_srat_memory(numamem, 0, 0, 0, 0); + numamem++; + } + + build_header(linker, table_data, + (void*)srat, ACPI_SRAT_SIGNATURE, srat_size, 1); +} + +static void +build_mcfg_q35(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{ + AcpiTableMcfg *mcfg; + + int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]); + mcfg = acpi_data_push(table_data, len); + mcfg->allocation[0].address = cpu_to_le64(guest_info->mcfg_base); + /* Only a single allocation so no need to play with segments */ + mcfg->allocation[0].pci_segment = cpu_to_le16(0); + mcfg->allocation[0].start_bus_number = 0; + mcfg->allocation[0].end_bus_number = 0xFF; + + build_header(linker, table_data, (void *)mcfg, ACPI_MCFG_SIGNATURE, len, 1); +} + +static void +build_dsdt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{ + void *dsdt; + assert(guest_info->dsdt_code && guest_info->dsdt_size); + dsdt = acpi_data_push(table_data, guest_info->dsdt_size); + memcpy(dsdt, guest_info->dsdt_code, guest_info->dsdt_size); +} + +/* Build final rsdt table */ +static void +build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets) +{ + AcpiRsdtDescriptorRev1 *rsdt; + size_t rsdt_len; + int i; + + rsdt_len = sizeof(*rsdt) + sizeof(uint32_t) * table_offsets->len; + rsdt = acpi_data_push(table_data, rsdt_len); + memcpy(rsdt->table_offset_entry, table_offsets->data, + sizeof(uint32_t) * table_offsets->len); + for (i = 0; i < table_offsets->len; ++i) { + /* rsdt->table_offset_entry to be filled by Guest linker */ + bios_linker_add_pointer(linker, + ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE, + table_data, &rsdt->table_offset_entry[i], + sizeof(uint32_t)); + } + build_header(linker, table_data, + (void*)rsdt, ACPI_RSDT_SIGNATURE, rsdt_len, 1); +} + +static GArray * +build_rsdp(GArray *linker, unsigned rsdt) +{ + GArray *rsdp_table; + AcpiRsdpDescriptor *rsdp; + + rsdp_table = g_array_new(false, true /* clear */, sizeof *rsdp); + g_array_set_size(rsdp_table, 1); + rsdp = (void *)rsdp_table->data; + + bios_linker_alloc(linker, ACPI_BUILD_RSDP_FILE, 1, true /* fseg memory */); + + rsdp->signature = cpu_to_le64(ACPI_RSDP_SIGNATURE); + memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6); + rsdp->rsdt_physical_address = cpu_to_le32(rsdt); + /* Address to be filled by Guest linker */ + bios_linker_add_pointer(linker, ACPI_BUILD_RSDP_FILE, ACPI_BUILD_TABLE_FILE, + rsdp_table, &rsdp->rsdt_physical_address, + sizeof rsdp->rsdt_physical_address); + rsdp->checksum = 0; + /* Checksum to be filled by Guest linker */ + bios_linker_add_checksum(linker, ACPI_BUILD_RSDP_FILE, + rsdp, rsdp, sizeof *rsdp, &rsdp->checksum); + + return rsdp_table; +} + +static void acpi_add_rom_blob(PcGuestInfo *guest_info, GArray *blob, + const char *name, unsigned align) +{ + MemoryRegion *mr = g_malloc(sizeof(*mr)); + + /* Align size to multiple of given size. This reduces the chance + * we need to change size in the future (breaking cross version migration). + */ + g_array_set_size(blob, (ROUND_UP(acpi_data_len(blob), align) + + g_array_get_element_size(blob) - 1) / + g_array_get_element_size(blob)); + memory_region_init_ram_ptr(mr, name, + acpi_data_len(blob), blob->data); + memory_region_set_readonly(mr, true); + vmstate_register_ram_global(mr); + rom_add_blob(ACPI_BUILD_TABLE_FILE, blob->data, acpi_data_len(blob), + -1, mr); + + fw_cfg_add_file(guest_info->fw_cfg, name, + blob->data, acpi_data_len(blob)); +} + +#define ACPI_MAX_ACPI_TABLES 20 +void acpi_setup(PcGuestInfo *guest_info) +{ + GArray *table_data, *table_offsets, *rsdp, *linker; + unsigned facs, dsdt, rsdt; + + if (!guest_info->fw_cfg) { + ACPI_BUILD_DPRINTF(3, "No fw cfg. Boiling out.\n"); + return; + } + + if (!guest_info->has_acpi_build) { + ACPI_BUILD_DPRINTF(3, "ACPI build disabled. Boiling out.\n"); + return; + } + + table_data = g_array_new(false, true /* clear */, 1); + table_offsets = g_array_new(false, true /* clear */, + sizeof(uint32_t)); + linker = bios_linker_init(); + + ACPI_BUILD_DPRINTF(3, "init ACPI tables\n"); + + bios_linker_alloc(linker, ACPI_BUILD_TABLE_FILE, 64 /* Ensure FACS is aligned */, + false /* high memory */); + + /* + * FACS is pointed to by FADT. + * We place it first since it's the only table that has alignment + * requirements. + */ + facs = table_data->len; + build_facs(table_data, linker, guest_info); + + /* DSDT is pointed to by FADT */ + dsdt = table_data->len; + build_dsdt(table_data, linker, guest_info); + + /* ACPI tables pointed to by RSDT */ + acpi_add_table(table_offsets, table_data); + build_fadt(table_data, linker, guest_info, facs, dsdt); + acpi_add_table(table_offsets, table_data); + build_ssdt(table_data, linker, guest_info->fw_cfg, guest_info); + acpi_add_table(table_offsets, table_data); + build_madt(table_data, linker, guest_info->fw_cfg, guest_info); + acpi_add_table(table_offsets, table_data); + if (guest_info->has_hpet) { + build_hpet(table_data, linker); + } + if (guest_info->numa_nodes) { + acpi_add_table(table_offsets, table_data); + build_srat(table_data, linker, guest_info->fw_cfg, guest_info); + } + if (guest_info->mcfg_base) { + acpi_add_table(table_offsets, table_data); + build_mcfg_q35(table_data, linker, guest_info); + } + + /* RSDT is pointed to by RSDP */ + rsdt = table_data->len; + build_rsdt(table_data, linker, table_offsets); + + /* RSDP is in FSEG memory, so allocate it separately */ + rsdp = build_rsdp(linker, rsdt); + + /* Now expose it all to Guest */ + acpi_add_rom_blob(guest_info, table_data, + ACPI_BUILD_TABLE_FILE, 0x10000); + + acpi_add_rom_blob(guest_info, linker, + "etc/linker-script", TARGET_PAGE_SIZE); + + /* + * RSDP is small so it's easy to keep it immutable, no need to + * bother with ROM blobs. + */ + fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, + rsdp->data, acpi_data_len(rsdp)); + + /* Cleanup GArray wrappers and memory if no longer used. */ + bios_linker_cleanup(linker); + g_array_free(table_offsets, true); + g_array_free(rsdp, false); + g_array_free(table_data, false); +} diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h new file mode 100644 index 0000000..e920229 --- /dev/null +++ b/hw/i386/acpi-defs.h @@ -0,0 +1,327 @@ +/* + * 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/. + */ +#ifndef QEMU_ACPI_DEFS_H +#define QEMU_ACPI_DEFS_H + +enum { + ACPI_FADT_F_WBINVD, + ACPI_FADT_F_WBINVD_FLUSH, + ACPI_FADT_F_PROC_C1, + ACPI_FADT_F_P_LVL2_UP, + ACPI_FADT_F_PWR_BUTTON, + ACPI_FADT_F_SLP_BUTTON, + ACPI_FADT_F_FIX_RTC, + ACPI_FADT_F_RTC_S4, + ACPI_FADT_F_TMR_VAL_EXT, + ACPI_FADT_F_DCK_CAP, + ACPI_FADT_F_RESET_REG_SUP, + ACPI_FADT_F_SEALED_CASE, + ACPI_FADT_F_HEADLESS, + ACPI_FADT_F_CPU_SW_SLP, + ACPI_FADT_F_PCI_EXP_WAK, + ACPI_FADT_F_USE_PLATFORM_CLOCK, + ACPI_FADT_F_S4_RTC_STS_VALID, + ACPI_FADT_F_REMOTE_POWER_ON_CAPABLE, + ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL, + ACPI_FADT_F_FORCE_APIC_PHYSICAL_DESTINATION_MODE, + ACPI_FADT_F_HW_REDUCED_ACPI, + ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE, +}; + +/* + * ACPI 2.0 Generic Address Space definition. + */ +struct Acpi20GenericAddress { + uint8_t address_space_id; + uint8_t register_bit_width; + uint8_t register_bit_offset; + uint8_t reserved; + uint64_t address; +} QEMU_PACKED; +typedef struct Acpi20GenericAddress Acpi20GenericAddress; + +#define ACPI_RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR " + +struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */ + uint64_t signature; /* ACPI signature, contains "RSD PTR " */ + uint8_t checksum; /* To make sum of struct == 0 */ + uint8_t oem_id [6]; /* OEM identification */ + uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */ + uint32_t rsdt_physical_address; /* 32-bit physical address of RSDT */ + uint32_t length; /* XSDT Length in bytes including hdr */ + uint64_t xsdt_physical_address; /* 64-bit physical address of XSDT */ + uint8_t extended_checksum; /* Checksum of entire table */ + uint8_t reserved [3]; /* Reserved field must be 0 */ +} QEMU_PACKED; +typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor; + +/* Table structure from Linux kernel (the ACPI tables are under the + BSD license) */ + + +#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ + uint32_t signature; /* ACPI signature (4 ASCII characters) */ \ + uint32_t length; /* Length of table, in bytes, including header */ \ + uint8_t revision; /* ACPI Specification minor version # */ \ + uint8_t checksum; /* To make sum of entire table == 0 */ \ + uint8_t oem_id [6]; /* OEM identification */ \ + uint8_t oem_table_id [8]; /* OEM table identification */ \ + uint32_t oem_revision; /* OEM revision number */ \ + uint8_t asl_compiler_id [4]; /* ASL compiler vendor ID */ \ + uint32_t asl_compiler_revision; /* ASL compiler revision number */ + + +struct AcpiTableHeader /* ACPI common table header */ +{ + ACPI_TABLE_HEADER_DEF +} QEMU_PACKED; +typedef struct AcpiTableHeader AcpiTableHeader; + +/* + * ACPI 1.0 Fixed ACPI Description Table (FADT) + */ +#define ACPI_FACP_SIGNATURE 0x50434146 // FACP +struct AcpiFadtDescriptorRev1 +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + uint32_t firmware_ctrl; /* Physical address of FACS */ + uint32_t dsdt; /* Physical address of DSDT */ + uint8_t model; /* System Interrupt Model */ + uint8_t reserved1; /* Reserved */ + uint16_t sci_int; /* System vector of SCI interrupt */ + uint32_t smi_cmd; /* Port address of SMI command port */ + uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */ + uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */ + uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */ + uint8_t reserved2; /* Reserved - must be zero */ + uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */ + uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */ + uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */ + uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */ + uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */ + uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */ + uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */ + uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */ + uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */ + uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */ + uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */ + uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */ + uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */ + uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */ + uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */ + uint8_t reserved3; /* Reserved */ + uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */ + uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */ + uint16_t flush_size; /* Size of area read to flush caches */ + uint16_t flush_stride; /* Stride used in flushing caches */ + uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */ + uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */ + uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */ + uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */ + uint8_t century; /* Index to century in RTC CMOS RAM */ + uint8_t reserved4; /* Reserved */ + uint8_t reserved4a; /* Reserved */ + uint8_t reserved4b; /* Reserved */ + uint32_t flags; +} QEMU_PACKED; +typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1; + +/* + * ACPI 1.0 Root System Description Table (RSDT) + */ +#define ACPI_RSDT_SIGNATURE 0x54445352 // RSDT +struct AcpiRsdtDescriptorRev1 +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + uint32_t table_offset_entry[0]; /* Array of pointers to other */ + /* ACPI tables */ +} QEMU_PACKED; +typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1; + +/* + * ACPI 1.0 Firmware ACPI Control Structure (FACS) + */ +#define ACPI_FACS_SIGNATURE 0x53434146 // FACS +struct AcpiFacsDescriptorRev1 +{ + uint32_t signature; /* ACPI Signature */ + uint32_t length; /* Length of structure, in bytes */ + uint32_t hardware_signature; /* Hardware configuration signature */ + uint32_t firmware_waking_vector; /* ACPI OS waking vector */ + uint32_t global_lock; /* Global Lock */ + uint32_t flags; + uint8_t resverved3 [40]; /* Reserved - must be zero */ +} QEMU_PACKED; +typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1; + +/* + * Differentiated System Description Table (DSDT) + */ +#define ACPI_DSDT_SIGNATURE 0x54445344 // DSDT + +/* + * MADT values and structures + */ + +/* Values for MADT PCATCompat */ + +#define ACPI_DUAL_PIC 0 +#define ACPI_MULTIPLE_APIC 1 + +/* Master MADT */ + +#define ACPI_APIC_SIGNATURE 0x43495041 // APIC +struct AcpiMultipleApicTable +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + uint32_t local_apic_address; /* Physical address of local APIC */ + uint32_t flags; +} QEMU_PACKED; +typedef struct AcpiMultipleApicTable AcpiMultipleApicTable; + +/* Values for Type in APIC sub-headers */ + +#define ACPI_APIC_PROCESSOR 0 +#define ACPI_APIC_IO 1 +#define ACPI_APIC_XRUPT_OVERRIDE 2 +#define ACPI_APIC_NMI 3 +#define ACPI_APIC_LOCAL_NMI 4 +#define ACPI_APIC_ADDRESS_OVERRIDE 5 +#define ACPI_APIC_IO_SAPIC 6 +#define ACPI_APIC_LOCAL_SAPIC 7 +#define ACPI_APIC_XRUPT_SOURCE 8 +#define ACPI_APIC_RESERVED 9 /* 9 and greater are reserved */ + +/* + * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) + */ +#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\ + uint8_t type; \ + uint8_t length; + +/* Sub-structures for MADT */ + +struct AcpiMadtProcessorApic +{ + ACPI_SUB_HEADER_DEF + uint8_t processor_id; /* ACPI processor id */ + uint8_t local_apic_id; /* Processor's local APIC id */ + uint32_t flags; +} QEMU_PACKED; +typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic; + +struct AcpiMadtIoApic +{ + ACPI_SUB_HEADER_DEF + uint8_t io_apic_id; /* I/O APIC ID */ + uint8_t reserved; /* Reserved - must be zero */ + uint32_t address; /* APIC physical address */ + uint32_t interrupt; /* Global system interrupt where INTI + * lines start */ +} QEMU_PACKED; +typedef struct AcpiMadtIoApic AcpiMadtIoApic; + +struct AcpiMadtIntsrcovr { + ACPI_SUB_HEADER_DEF + uint8_t bus; + uint8_t source; + uint32_t gsi; + uint16_t flags; +} QEMU_PACKED; +typedef struct AcpiMadtIntsrcovr AcpiMadtIntsrcovr; + +struct AcpiMadtLocalNmi { + ACPI_SUB_HEADER_DEF + uint8_t processor_id; /* ACPI processor id */ + uint16_t flags; /* MPS INTI flags */ + uint8_t lint; /* Local APIC LINT# */ +} QEMU_PACKED; +typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi; + +/* + * HPET Description Table + */ +#define ACPI_HPET_SIGNATURE 0x54455048 // HPET +struct Acpi20Hpet { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + uint32_t timer_block_id; + Acpi20GenericAddress addr; + uint8_t hpet_number; + uint16_t min_tick; + uint8_t page_protect; +} QEMU_PACKED; +typedef struct Acpi20Hpet Acpi20Hpet; + +/* + * SRAT (NUMA topology description) table + */ + +#define ACPI_SRAT_SIGNATURE 0x54415253 // SRAT +struct AcpiSystemResourceAffinityTable +{ + ACPI_TABLE_HEADER_DEF + uint32_t reserved1; + uint32_t reserved2[2]; +} QEMU_PACKED; +typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable; + +#define ACPI_SRAT_PROCESSOR 0 +#define ACPI_SRAT_MEMORY 1 + +struct AcpiSratProcessorAffinity +{ + ACPI_SUB_HEADER_DEF + uint8_t proximity_lo; + uint8_t local_apic_id; + uint32_t flags; + uint8_t local_sapic_eid; + uint8_t proximity_hi[3]; + uint32_t reserved; +} QEMU_PACKED; +typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity; + +struct AcpiSratMemoryAffinity +{ + ACPI_SUB_HEADER_DEF + uint8_t proximity[4]; + uint16_t reserved1; + uint64_t base_addr; + uint64_t range_length; + uint32_t reserved2; + uint32_t flags; + uint32_t reserved3[2]; +} QEMU_PACKED; +typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity; + +/* PCI fw r3.0 MCFG table. */ +/* Subtable */ +struct AcpiMcfgAllocation { + uint64_t address; /* Base address, processor-relative */ + uint16_t pci_segment; /* PCI segment group number */ + uint8_t start_bus_number; /* Starting PCI Bus number */ + uint8_t end_bus_number; /* Final PCI Bus number */ + uint32_t reserved; +} QEMU_PACKED; +typedef struct AcpiMcfgAllocation AcpiMcfgAllocation; + +#define ACPI_MCFG_SIGNATURE 0x4746434d // MCFG +struct AcpiTableMcfg { + ACPI_TABLE_HEADER_DEF; + uint8_t reserved[8]; + AcpiMcfgAllocation allocation[0]; +} QEMU_PACKED; +typedef struct AcpiTableMcfg AcpiTableMcfg; + +#endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e5ebfa5..9f9207d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -55,6 +55,7 @@ #include "hw/acpi/acpi.h" #include "hw/cpu/icc_bus.h" #include "hw/boards.h" +#include "hw/i386/acpi-build.h"
/* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1045,6 +1046,7 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) PcGuestInfoState, machine_done); pc_fw_cfg_guest_info(&guest_info_state->info); + acpi_setup(&guest_info_state->info); }
PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3c2541a..ab176ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, @@ -125,6 +126,7 @@ static void pc_init1(MemoryRegion *system_memory,
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
+ guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof AcpiDsdtAmlCode;
@@ -269,6 +271,7 @@ static void pc_init_pci(QEMUMachineInitArgs *args) static void pc_init_pci_1_5(QEMUMachineInitArgs *args) { has_pci_info = false; + has_acpi_build = false; pc_init_pci(args); }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 50afe7c..9539807 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -50,6 +50,7 @@
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_q35_init(QEMUMachineInitArgs *args) @@ -111,6 +112,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info; + guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = Q35AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
@@ -221,6 +223,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) static void pc_q35_init_1_5(QEMUMachineInitArgs *args) { has_pci_info = false; + has_acpi_build = false; pc_q35_init(args); }
diff --git a/hw/i386/ssdt-misc.dsl b/hw/i386/ssdt-misc.dsl index ac11e96..a4484b8 100644 --- a/hw/i386/ssdt-misc.dsl +++ b/hw/i386/ssdt-misc.dsl @@ -70,4 +70,50 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) Zero /* reserved */ }) } + + External(_SB.PCI0, DeviceObj) + External(_SB.PCI0.ISA, DeviceObj) + + Scope(_SB.PCI0.ISA) { + Device(PEVT) { + Name(_HID, "QEMU0001") + /* PEST will be patched to be Zero if no such device */ + ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pest + Name(PEST, 0xFFFF) + OperationRegion(PEOR, SystemIO, PEST, 0x01) + Field(PEOR, ByteAcc, NoLock, Preserve) { + PEPT, 8, + } + + Method(_STA, 0, NotSerialized) { + Store(PEST, Local0) + If (LEqual(Local0, Zero)) { + Return (0x00) + } Else { + Return (0x0F) + } + } + + Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + } + + Name(_CRS, ResourceTemplate() { + IO(Decode16, 0x00, 0x00, 0x01, 0x01, IO) + }) + + CreateWordField(_CRS, IO._MIN, IOMN) + CreateWordField(_CRS, IO._MAX, IOMX) + + Method(_INI, 0, NotSerialized) { + Store(PEST, IOMN) + Store(PEST, IOMX) + } + } + } } diff --git a/include/hw/i386/acpi-build.h b/include/hw/i386/acpi-build.h new file mode 100644 index 0000000..e57b1aa --- /dev/null +++ b/include/hw/i386/acpi-build.h @@ -0,0 +1,9 @@ + +#ifndef HW_I386_ACPI_BUILD_H +#define HW_I386_ACPI_BUILD_H + +#include "qemu/typedefs.h" + +void acpi_setup(PcGuestInfo *); + +#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b29c8f6..02cc559 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -51,6 +51,7 @@ struct PcGuestInfo { unsigned dsdt_size; uint16_t pvpanic_port; FWCfgState *fw_cfg; + bool has_acpi_build; };
/* parallel.c */
"Michael S. Tsirkin" mst@redhat.com writes:
This adds C code for generating ACPI tables at runtime, imported from seabios git tree commit 51684b7ced75fb76776e8ee84833fcfb6ecf12dd
Although ACPI tables come from a system BIOS on real hw, it makes sense that the ACPI tables are coupled with the virtual machine, since they have to abstract the x86 machine to the OS's.
This is widely desired as a way to avoid the churn and proliferation of QEMU-specific interfaces associated with ACPI tables in bios code.
Notes: The code structure was intentionally kept as close to the seabios original as possible, to simplify comparison and making sure we didn't lose anything in translation.
Minor code duplication results, to help ensure there are no functional regressions, I think it's better to merge it like this and do more code changes in follow-up patches.
Cross-version compatibility concerns have been addressed: ACPI tables are exposed to guest as FW_CFG entries. When running with -M 1.5 and older, this patch disables ACPI table generation, and doesn't expose ACPI tables to guest.
As table content is likely to change over time, the following measures are taken to simplify cross-version migration: - All tables besides the RSDP are packed in a single FW CFG entry. This entry size is currently 23K. We round it up to 64K to avoid too much churn there. - Tables are placed in special ROM blob (not mapped into guest memory) which is automatically migrated together with the guest, same as BIOS code.
This seems reasonable.
This patch reuses some code from SeaBIOS, which was originally under LGPLv2 and then relicensed to GPLv3 or LGPLv3, in QEMU under GPLv2+. This relicensing has been acked by all contributors that had contributed to the code since the v2->v3 relicense. ACKs approving the v2+ relicensing are listed below. The list might include ACKs from people not holding copyright on any parts of the reused code, but it's better to err on the side of caution and include them.
Thank you for collecting the Acks.
Affected SeaBIOS files (GPLv2+ license headers added) http://thread.gmane.org/gmane.comp.bios.coreboot.seabios/5949:
src/acpi-dsdt-cpu-hotplug.dsl src/acpi-dsdt-dbug.dsl src/acpi-dsdt-hpet.dsl src/acpi-dsdt-isa.dsl src/acpi-dsdt-pci-crs.dsl src/acpi.c src/acpi.h src/ssdt-misc.dsl src/ssdt-pcihp.dsl src/ssdt-proc.dsl tools/acpi_extract.py tools/acpi_extract_preprocess.py
Each one of the listed people agreed to the following:
If you allow the use of your contribution in QEMU under the terms of GPLv2 or later as proposed by this patch, please respond to this mail including the line:
Acked-by: Name <email address>
Acked-by: Gerd Hoffmann kraxel@redhat.com Acked-by: Jan Kiszka jan.kiszka@siemens.com Acked-by: Jason Baron jbaron@akamai.com Acked-by: David Woodhouse David.Woodhouse@intel.com Acked-by: Gleb Natapov gleb@redhat.com Acked-by: Marcelo Tosatti mtosatti@redhat.com Acked-by: Dave Frodin dave.frodin@se-eng.com Acked-by: Paolo Bonzini pbonzini@redhat.com Acked-by: Kevin O'Connor kevin@koconnor.net Acked-by: Laszlo Ersek lersek@redhat.com Acked-by: Kenji Kaneshige kaneshige.kenji@jp.fujitsu.com Acked-by: Isaku Yamahata yamahata@valinux.co.jp Acked-by: Magnus Christensson magnus.christensson@intel.com Acked-by: Hu Tao hutao@cn.fujitsu.com Acked-by: Eduardo Habkost ehabkost@redhat.com
Signed-off-by: Michael S. Tsirkin mst@redhat.com
hw/i386/Makefile.objs | 2 + hw/i386/acpi-build.c | 723 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-defs.h | 327 +++++++++++++++++++ hw/i386/pc.c | 2 + hw/i386/pc_piix.c | 3 + hw/i386/pc_q35.c | 3 + hw/i386/ssdt-misc.dsl | 46 +++ include/hw/i386/acpi-build.h | 9 + include/hw/i386/pc.h | 1 + 9 files changed, 1116 insertions(+) create mode 100644 hw/i386/acpi-build.c create mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/i386/acpi-build.h
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index e783050..2ab2572 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,7 +4,9 @@ obj-y += pc.o pc_piix.o pc_q35.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o +obj-y += acpi-build.o obj-y += bios-linker-loader.o +hw/i386/acpi-build.o: hw/i386/acpi-build.c hw/i386/acpi-dsdt.hex hw/i386/ssdt-proc.hex hw/i386/ssdt-pcihp.hex hw/i386/ssdt-misc.hex hw/i386/q35-acpi-dsdt.hex hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c new file mode 100644 index 0000000..bc44f95 --- /dev/null +++ b/hw/i386/acpi-build.c @@ -0,0 +1,723 @@ +/* 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 "hw/i386/acpi-build.h" +#include <stddef.h> +#include <glib.h> +#include "qemu/bitmap.h" +#include "qemu/range.h" +#include "hw/pci/pci.h" +#include "qom/cpu.h" +#include "hw/i386/pc.h" +#include "target-i386/cpu.h" +#include "hw/timer/hpet.h" +#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/i386/bios-linker-loader.h" +#include "hw/loader.h"
+#define ACPI_BUILD_APPNAME "Bochs" +#define ACPI_BUILD_APPNAME6 "BOCHS " +#define ACPI_BUILD_APPNAME4 "BXPC"
+#define ACPI_BUILD_DPRINTF(level, fmt, ...) do {} while(0)
+#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables" +#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
+static void +build_header(GArray *linker, GArray *table_data,
AcpiTableHeader *h, uint32_t sig, int len, uint8_t rev)+{
- h->signature = cpu_to_le32(sig);
- h->length = cpu_to_le32(len);
- h->revision = rev;
- memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);
- memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4);
- memcpy(h->oem_table_id + 4, (void*)&sig, 4);
- h->oem_revision = cpu_to_le32(1);
- memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4);
- h->asl_compiler_revision = cpu_to_le32(1);
- h->checksum = 0;
- /* Checksum to be filled in by Guest linker */
- bios_linker_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
table_data->data, h, len, &h->checksum);+}
+#define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT */ +#define ACPI_PORT_PM_BASE 0xb000
+static inline void *acpi_data_push(GArray *table_data, unsigned size) +{
- unsigned off = table_data->len;
- g_array_set_size(table_data, off + size);
- return table_data->data + off;
+}
+static unsigned acpi_data_len(GArray *table) +{
- return table->len * g_array_get_element_size(table);
+}
+static inline void acpi_add_table(GArray *table_offsets, GArray *table_data) +{
- uint32_t offset = cpu_to_le32(table_data->len);
- g_array_append_val(table_offsets, offset);
+}
+/* FACS */ +static void +build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);
- facs->signature = cpu_to_le32(ACPI_FACS_SIGNATURE);
- facs->length = cpu_to_le32(sizeof(*facs));
+}
+/* Load chipset information into FADT */ +static void fadt_setup(AcpiFadtDescriptorRev1 *fadt, PcGuestInfo *guest_info) +{
- fadt->model = 1;
- fadt->reserved1 = 0;
- fadt->sci_int = cpu_to_le16(guest_info->sci_int);
- fadt->smi_cmd = cpu_to_le32(ACPI_PORT_SMI_CMD);
- fadt->acpi_enable = guest_info->acpi_enable_cmd;
- fadt->acpi_disable = guest_info->acpi_disable_cmd;
- fadt->pm1a_evt_blk = cpu_to_le32(ACPI_PORT_PM_BASE);
- fadt->pm1a_cnt_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x04);
- fadt->pm_tmr_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x08);
- fadt->gpe0_blk = cpu_to_le32(guest_info->gpe0_blk);
- fadt->pm1_evt_len = 4;
- fadt->pm1_cnt_len = 2;
- fadt->pm_tmr_len = 4;
- fadt->gpe0_blk_len = guest_info->gpe0_blk_len;
- fadt->plvl2_lat = cpu_to_le16(0xfff); /* C2 state not supported */
- fadt->plvl3_lat = cpu_to_le16(0xfff); /* C3 state not supported */
- fadt->flags = cpu_to_le32((1 << ACPI_FADT_F_WBINVD) |
(1 << ACPI_FADT_F_PROC_C1) |(1 << ACPI_FADT_F_SLP_BUTTON) |(1 << ACPI_FADT_F_RTC_S4));- if (guest_info->fix_rtc) {
fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_FIX_RTC);- }
- if (guest_info->platform_timer) {
fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_USE_PLATFORM_CLOCK);- }
+}
+/* FADT */ +static void +build_fadt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info,
unsigned facs, unsigned dsdt)+{
- AcpiFadtDescriptorRev1 *fadt = acpi_data_push(table_data, sizeof(*fadt));
- fadt->firmware_ctrl = cpu_to_le32(facs);
- /* FACS address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,
table_data, &fadt->firmware_ctrl,sizeof fadt->firmware_ctrl);- fadt->dsdt = cpu_to_le32(dsdt);
- /* DSDT address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,
table_data, &fadt->dsdt,sizeof fadt->dsdt);- fadt_setup(fadt, guest_info);
- build_header(linker, table_data,
(void*)fadt, ACPI_FACP_SIGNATURE, sizeof(*fadt), 1);+}
+static void +build_madt(GArray *table_data, GArray *linker, FWCfgState *fw_cfg, PcGuestInfo *guest_info) +{
- int madt_size;
- AcpiMultipleApicTable *madt;
- AcpiMadtProcessorApic *apic;
- AcpiMadtIoApic *io_apic;
- AcpiMadtIntsrcovr *intsrcovr;
- AcpiMadtLocalNmi *local_nmi;
- madt_size = (sizeof(AcpiMultipleApicTable)
+ sizeof(AcpiMadtProcessorApic) * guest_info->apic_id_limit+ sizeof(AcpiMadtIoApic)+ sizeof(AcpiMadtIntsrcovr) * 16+ sizeof(AcpiMadtLocalNmi));- madt = acpi_data_push(table_data, madt_size);
- madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
- madt->flags = cpu_to_le32(1);
- apic = (void*)&madt[1];
- int i;
Variables belong at top of functions.
The fancy casting math is dangerous too. You're overrunning buffers and will likely confuse static checks.
Best to use a void * pointer and do the assignments based on offsets.
- for (i=0; i < guest_info->apic_id_limit; i++) {
apic->type = ACPI_APIC_PROCESSOR;apic->length = sizeof(*apic);apic->processor_id = i;apic->local_apic_id = i;if (test_bit(i, guest_info->found_cpus))apic->flags = cpu_to_le32(1);elseapic->flags = cpu_to_le32(0);apic++;- }
- io_apic = (void*)apic;
- io_apic->type = ACPI_APIC_IO;
- io_apic->length = sizeof(*io_apic);
+#define ACPI_BUILD_IOAPIC_ID 0x0
- 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);
- intsrcovr = (void*)&io_apic[1];
- if (guest_info->apic_xrupt_override) {
memset(intsrcovr, 0, 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 */intsrcovr++;- }
- 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;memset(intsrcovr, 0, 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 */intsrcovr++;- }
- local_nmi = (void*)intsrcovr;
- 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 */
- local_nmi++;
- build_header(linker, table_data,
(void*)madt, ACPI_APIC_SIGNATURE,(void*)local_nmi - (void*)madt, 1);+}
+/* Encode a hex value */ +static inline char acpi_get_hex(uint32_t val) {
- val &= 0x0f;
- return (val <= 9) ? ('0' + val) : ('A' + val - 10);
+}
+/* Encode a length in an SSDT. */ +static uint8_t * +acpi_encode_len(uint8_t *ssdt_ptr, int length, int bytes) +{
- switch (bytes) {
- default:
- case 4: ssdt_ptr[3] = ((length >> 20) & 0xff);
- case 3: ssdt_ptr[2] = ((length >> 12) & 0xff);
- case 2: ssdt_ptr[1] = ((length >> 4) & 0xff);
ssdt_ptr[0] = (((bytes - 1) & 0x3) << 6) | (length & 0x0f);break;- case 1: ssdt_ptr[0] = length & 0x3f;
- }
- return ssdt_ptr + bytes;
+}
+#include "hw/i386/ssdt-proc.hex"
+/* 0x5B 0x83 ProcessorOp PkgLength NameString ProcID */ +#define ACPI_PROC_OFFSET_CPUHEX (*ssdt_proc_name - *ssdt_proc_start + 2) +#define ACPI_PROC_OFFSET_CPUID1 (*ssdt_proc_name - *ssdt_proc_start + 4) +#define ACPI_PROC_OFFSET_CPUID2 (*ssdt_proc_id - *ssdt_proc_start) +#define ACPI_PROC_SIZEOF (*ssdt_proc_end - *ssdt_proc_start) +#define ACPI_PROC_AML (ssdp_proc_aml + *ssdt_proc_start)
+/* 0x5B 0x82 DeviceOp PkgLength NameString */ +#define ACPI_PCIHP_OFFSET_HEX (*ssdt_pcihp_name - *ssdt_pcihp_start + 1) +#define ACPI_PCIHP_OFFSET_ID (*ssdt_pcihp_id - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_ADR (*ssdt_pcihp_adr - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_EJ0 (*ssdt_pcihp_ej0 - *ssdt_pcihp_start) +#define ACPI_PCIHP_SIZEOF (*ssdt_pcihp_end - *ssdt_pcihp_start) +#define ACPI_PCIHP_AML (ssdp_pcihp_aml + *ssdt_pcihp_start)
+#define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */ +#define ACPI_SSDT_HEADER_LENGTH 36
+#include "hw/i386/ssdt-misc.hex" +#include "hw/i386/ssdt-pcihp.hex"
+static uint8_t* +build_notify(uint8_t *ssdt_ptr, const char *name, int skip, int count,
const char *target, int ofs)+{
- int i;
- count -= skip;
- *(ssdt_ptr++) = 0x14; /* MethodOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+5+(12*count), 2);
- memcpy(ssdt_ptr, name, 4);
- ssdt_ptr += 4;
- *(ssdt_ptr++) = 0x02; /* MethodOp */
- for (i = skip; count-- > 0; i++) {
*(ssdt_ptr++) = 0xA0; /* IfOp */ssdt_ptr = acpi_encode_len(ssdt_ptr, 11, 1);*(ssdt_ptr++) = 0x93; /* LEqualOp */*(ssdt_ptr++) = 0x68; /* Arg0Op */*(ssdt_ptr++) = 0x0A; /* BytePrefix */*(ssdt_ptr++) = i;*(ssdt_ptr++) = 0x86; /* NotifyOp */memcpy(ssdt_ptr, target, 4);ssdt_ptr[ofs] = acpi_get_hex(i >> 4);ssdt_ptr[ofs + 1] = acpi_get_hex(i);ssdt_ptr += 4;*(ssdt_ptr++) = 0x69; /* Arg1Op */- }
- return ssdt_ptr;
+}
+static void patch_pcihp(int slot, uint8_t *ssdt_ptr, uint32_t eject) +{
- ssdt_ptr[ACPI_PCIHP_OFFSET_HEX] = acpi_get_hex(slot >> 4);
- ssdt_ptr[ACPI_PCIHP_OFFSET_HEX+1] = acpi_get_hex(slot);
- ssdt_ptr[ACPI_PCIHP_OFFSET_ID] = slot;
- ssdt_ptr[ACPI_PCIHP_OFFSET_ADR + 2] = slot;
- /* Runtime patching of ACPI_EJ0: to disable hotplug for a slot,
* replace the method name: _EJ0 by ACPI_EJ0_. */- /* Sanity check */
- assert (!memcmp(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "_EJ0", 4));
- if (!eject) {
memcpy(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "EJ0_", 4);- }
+}
+static void +build_ssdt(GArray *table_data, GArray *linker,
FWCfgState *fw_cfg, PcGuestInfo *guest_info)+{
- int acpi_cpus = MIN(0xff, guest_info->apic_id_limit);
- int length = (sizeof(ssdp_misc_aml) /* _S3_ / _S4_ / _S5_ */
+ (1+3+4) /* Scope(_SB_) */+ (acpi_cpus * ACPI_PROC_SIZEOF) /* procs */+ (1+2+5+(12*acpi_cpus)) /* NTFY */+ (6+2+1+(1*acpi_cpus)) /* CPON */+ (1+3+4) /* Scope(PCI0) */+ ((PCI_SLOT_MAX - 1) * ACPI_PCIHP_SIZEOF) /* slots */+ (1+2+5+(12*(PCI_SLOT_MAX - 1)))); /* PCNT */- uint8_t *ssdt = acpi_data_push(table_data, length);
- uint8_t *ssdt_ptr = ssdt;
- /* Copy header and encode fwcfg values in the S3_ / S4_ / S5_ packages */
- memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml));
- if (guest_info->s3_disabled) {
ssdt_ptr[acpi_s3_name[0]] = 'X';- }
- if (guest_info->s4_disabled) {
ssdt_ptr[acpi_s4_name[0]] = 'X';- } else {
ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt[acpi_s4_pkg[0] + 3] =guest_info->s4_val;- }
- *(uint32_t*)&ssdt_ptr[acpi_pci32_start[0]] =
cpu_to_le32(guest_info->pci_info.w32.begin);- *(uint32_t*)&ssdt_ptr[acpi_pci32_end[0]] =
cpu_to_le32(guest_info->pci_info.w32.end - 1);
I don't think you're guaranteed natural alignment here so you need to use memcpys.
Regards,
Anthony Liguori
- if (guest_info->pci_info.w64.end > guest_info->pci_info.w64.begin) {
ssdt_ptr[acpi_pci64_valid[0]] = 1;*(uint64_t*)&ssdt_ptr[acpi_pci64_start[0]] =cpu_to_le64(guest_info->pci_info.w64.begin);*(uint64_t*)&ssdt_ptr[acpi_pci64_end[0]] =cpu_to_le64(guest_info->pci_info.w64.end - 1);*(uint64_t*)&ssdt_ptr[acpi_pci64_length[0]] =cpu_to_le64(guest_info->pci_info.w64.end -guest_info->pci_info.w64.begin);- } else {
ssdt_ptr[acpi_pci64_valid[0]] = 0;- }
- *(uint16_t *)(ssdt_ptr + *ssdt_isa_pest) =
cpu_to_le16(guest_info->pvpanic_port);- ssdt_ptr += sizeof(ssdp_misc_aml);
- /* build Scope(_SB_) header */
- *(ssdt_ptr++) = 0x10; /* ScopeOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3);
- *(ssdt_ptr++) = '_';
- *(ssdt_ptr++) = 'S';
- *(ssdt_ptr++) = 'B';
- *(ssdt_ptr++) = '_';
- /* build Processor object for each processor */
- int i;
- for (i=0; i<acpi_cpus; i++) {
memcpy(ssdt_ptr, ACPI_PROC_AML, ACPI_PROC_SIZEOF);ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX] = acpi_get_hex(i >> 4);ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX+1] = acpi_get_hex(i);ssdt_ptr[ACPI_PROC_OFFSET_CPUID1] = i;ssdt_ptr[ACPI_PROC_OFFSET_CPUID2] = i;ssdt_ptr += ACPI_PROC_SIZEOF;- }
- /* build "Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...}" */
- /* Arg0 = Processor ID = APIC ID */
- ssdt_ptr = build_notify(ssdt_ptr, "NTFY", 0, acpi_cpus, "CP00", 2);
- /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" */
- *(ssdt_ptr++) = 0x08; /* NameOp */
- *(ssdt_ptr++) = 'C';
- *(ssdt_ptr++) = 'P';
- *(ssdt_ptr++) = 'O';
- *(ssdt_ptr++) = 'N';
- *(ssdt_ptr++) = 0x12; /* PackageOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+1+(1*acpi_cpus), 2);
- *(ssdt_ptr++) = acpi_cpus;
- for (i=0; i<acpi_cpus; i++)
*(ssdt_ptr++) = (test_bit(i, guest_info->found_cpus)) ? 0x01 : 0x00;- /* build Scope(PCI0) opcode */
- *(ssdt_ptr++) = 0x10; /* ScopeOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3);
- *(ssdt_ptr++) = 'P';
- *(ssdt_ptr++) = 'C';
- *(ssdt_ptr++) = 'I';
- *(ssdt_ptr++) = '0';
- /* build Device object for each slot */
- for (i = 1; i < PCI_SLOT_MAX; i++) {
bool eject = test_bit(i, guest_info->slot_hotplug_enable);memcpy(ssdt_ptr, ACPI_PCIHP_AML, ACPI_PCIHP_SIZEOF);patch_pcihp(i, ssdt_ptr, eject);ssdt_ptr += ACPI_PCIHP_SIZEOF;- }
- ssdt_ptr = build_notify(ssdt_ptr, "PCNT", 1, PCI_SLOT_MAX, "S00_", 1);
- build_header(linker, table_data,
(void*)ssdt, ACPI_SSDT_SIGNATURE, ssdt_ptr - ssdt, 1);+}
+static void +build_hpet(GArray *table_data, GArray *linker) +{
- Acpi20Hpet *hpet;
- hpet = acpi_data_push(table_data, sizeof(*hpet));
- /* Note timer_block_id value must be kept in sync with value advertised by
* emulated hpet*/- hpet->timer_block_id = cpu_to_le32(0x8086a201);
- hpet->addr.address = cpu_to_le64(HPET_BASE);
- build_header(linker, table_data,
(void*)hpet, ACPI_HPET_SIGNATURE, sizeof(*hpet), 1);+}
+static void +acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem,
uint64_t base, uint64_t len, int node, int enabled)+{
- numamem->type = ACPI_SRAT_MEMORY;
- numamem->length = sizeof(*numamem);
- memset(numamem->proximity, 0, 4);
- numamem->proximity[0] = node;
- numamem->flags = cpu_to_le32(!!enabled);
- numamem->base_addr = cpu_to_le64(base);
- numamem->range_length = cpu_to_le64(len);
+}
+static void +build_srat(GArray *table_data, GArray *linker,
FWCfgState *fw_cfg, PcGuestInfo *guest_info)+{
- AcpiSystemResourceAffinityTable *srat;
- AcpiSratProcessorAffinity *core;
- AcpiSratMemoryAffinity *numamem;
- int i;
- uint64_t curnode;
- int srat_size;
- int slots;
- uint64_t mem_len, mem_base, next_base;
- srat_size = sizeof(*srat) +
sizeof(AcpiSratProcessorAffinity) * guest_info->apic_id_limit +sizeof(AcpiSratMemoryAffinity) * (guest_info->numa_nodes + 2);- srat = acpi_data_push(table_data, srat_size);
- srat->reserved1 = cpu_to_le32(1);
- core = (void*)(srat + 1);
- for (i = 0; i < guest_info->apic_id_limit; ++i) {
core->type = ACPI_SRAT_PROCESSOR;core->length = sizeof(*core);core->local_apic_id = i;curnode = guest_info->node_cpu[i];core->proximity_lo = curnode;memset(core->proximity_hi, 0, 3);core->local_sapic_eid = 0;if (test_bit(i, guest_info->found_cpus))core->flags = cpu_to_le32(1);elsecore->flags = cpu_to_le32(0);core++;- }
- /* the memory map is a bit tricky, it contains at least one hole
* from 640k-1M and possibly another one from 3.5G-4G.*/- numamem = (void*)core;
- slots = 0;
- next_base = 0;
- acpi_build_srat_memory(numamem, 0, 640*1024, 0, 1);
- next_base = 1024 * 1024;
- numamem++;
- slots++;
- for (i = 1; i < guest_info->numa_nodes + 1; ++i) {
mem_base = next_base;mem_len = guest_info->node_mem[i - 1];if (i == 1)mem_len -= 1024 * 1024;next_base = mem_base + mem_len;/* Cut out the ACPI_PCI hole */if (mem_base <= guest_info->ram_size &&next_base > guest_info->ram_size) {mem_len -= next_base - guest_info->ram_size;if (mem_len > 0) {acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1);numamem++;slots++;}mem_base = 1ULL << 32;mem_len = next_base - guest_info->ram_size;next_base += (1ULL << 32) - guest_info->ram_size;}acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1);numamem++;slots++;- }
- for (; slots < guest_info->numa_nodes + 2; slots++) {
acpi_build_srat_memory(numamem, 0, 0, 0, 0);numamem++;- }
- build_header(linker, table_data,
(void*)srat, ACPI_SRAT_SIGNATURE, srat_size, 1);+}
+static void +build_mcfg_q35(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- AcpiTableMcfg *mcfg;
- int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]);
- mcfg = acpi_data_push(table_data, len);
- mcfg->allocation[0].address = cpu_to_le64(guest_info->mcfg_base);
- /* Only a single allocation so no need to play with segments */
- mcfg->allocation[0].pci_segment = cpu_to_le16(0);
- mcfg->allocation[0].start_bus_number = 0;
- mcfg->allocation[0].end_bus_number = 0xFF;
- build_header(linker, table_data, (void *)mcfg, ACPI_MCFG_SIGNATURE, len, 1);
+}
+static void +build_dsdt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- void *dsdt;
- assert(guest_info->dsdt_code && guest_info->dsdt_size);
- dsdt = acpi_data_push(table_data, guest_info->dsdt_size);
- memcpy(dsdt, guest_info->dsdt_code, guest_info->dsdt_size);
+}
+/* Build final rsdt table */ +static void +build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets) +{
- AcpiRsdtDescriptorRev1 *rsdt;
- size_t rsdt_len;
- int i;
- rsdt_len = sizeof(*rsdt) + sizeof(uint32_t) * table_offsets->len;
- rsdt = acpi_data_push(table_data, rsdt_len);
- memcpy(rsdt->table_offset_entry, table_offsets->data,
sizeof(uint32_t) * table_offsets->len);- for (i = 0; i < table_offsets->len; ++i) {
/* rsdt->table_offset_entry to be filled by Guest linker */bios_linker_add_pointer(linker,ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,table_data, &rsdt->table_offset_entry[i],sizeof(uint32_t));- }
- build_header(linker, table_data,
(void*)rsdt, ACPI_RSDT_SIGNATURE, rsdt_len, 1);+}
+static GArray * +build_rsdp(GArray *linker, unsigned rsdt) +{
- GArray *rsdp_table;
- AcpiRsdpDescriptor *rsdp;
- rsdp_table = g_array_new(false, true /* clear */, sizeof *rsdp);
- g_array_set_size(rsdp_table, 1);
- rsdp = (void *)rsdp_table->data;
- bios_linker_alloc(linker, ACPI_BUILD_RSDP_FILE, 1, true /* fseg memory */);
- rsdp->signature = cpu_to_le64(ACPI_RSDP_SIGNATURE);
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
- rsdp->rsdt_physical_address = cpu_to_le32(rsdt);
- /* Address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_RSDP_FILE, ACPI_BUILD_TABLE_FILE,
rsdp_table, &rsdp->rsdt_physical_address,sizeof rsdp->rsdt_physical_address);- rsdp->checksum = 0;
- /* Checksum to be filled by Guest linker */
- bios_linker_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
rsdp, rsdp, sizeof *rsdp, &rsdp->checksum);- return rsdp_table;
+}
+static void acpi_add_rom_blob(PcGuestInfo *guest_info, GArray *blob,
const char *name, unsigned align)+{
- MemoryRegion *mr = g_malloc(sizeof(*mr));
- /* Align size to multiple of given size. This reduces the chance
* we need to change size in the future (breaking cross version migration).*/- g_array_set_size(blob, (ROUND_UP(acpi_data_len(blob), align) +
g_array_get_element_size(blob) - 1) /g_array_get_element_size(blob));- memory_region_init_ram_ptr(mr, name,
acpi_data_len(blob), blob->data);- memory_region_set_readonly(mr, true);
- vmstate_register_ram_global(mr);
- rom_add_blob(ACPI_BUILD_TABLE_FILE, blob->data, acpi_data_len(blob),
-1, mr);- fw_cfg_add_file(guest_info->fw_cfg, name,
blob->data, acpi_data_len(blob));+}
+#define ACPI_MAX_ACPI_TABLES 20 +void acpi_setup(PcGuestInfo *guest_info) +{
- GArray *table_data, *table_offsets, *rsdp, *linker;
- unsigned facs, dsdt, rsdt;
- if (!guest_info->fw_cfg) {
ACPI_BUILD_DPRINTF(3, "No fw cfg. Boiling out.\n");return;- }
- if (!guest_info->has_acpi_build) {
ACPI_BUILD_DPRINTF(3, "ACPI build disabled. Boiling out.\n");return;- }
- table_data = g_array_new(false, true /* clear */, 1);
- table_offsets = g_array_new(false, true /* clear */,
sizeof(uint32_t));- linker = bios_linker_init();
- ACPI_BUILD_DPRINTF(3, "init ACPI tables\n");
- bios_linker_alloc(linker, ACPI_BUILD_TABLE_FILE, 64 /* Ensure FACS is aligned */,
false /* high memory */);- /*
* FACS is pointed to by FADT.* We place it first since it's the only table that has alignment* requirements.*/- facs = table_data->len;
- build_facs(table_data, linker, guest_info);
- /* DSDT is pointed to by FADT */
- dsdt = table_data->len;
- build_dsdt(table_data, linker, guest_info);
- /* ACPI tables pointed to by RSDT */
- acpi_add_table(table_offsets, table_data);
- build_fadt(table_data, linker, guest_info, facs, dsdt);
- acpi_add_table(table_offsets, table_data);
- build_ssdt(table_data, linker, guest_info->fw_cfg, guest_info);
- acpi_add_table(table_offsets, table_data);
- build_madt(table_data, linker, guest_info->fw_cfg, guest_info);
- acpi_add_table(table_offsets, table_data);
- if (guest_info->has_hpet) {
build_hpet(table_data, linker);- }
- if (guest_info->numa_nodes) {
acpi_add_table(table_offsets, table_data);build_srat(table_data, linker, guest_info->fw_cfg, guest_info);- }
- if (guest_info->mcfg_base) {
acpi_add_table(table_offsets, table_data);build_mcfg_q35(table_data, linker, guest_info);- }
- /* RSDT is pointed to by RSDP */
- rsdt = table_data->len;
- build_rsdt(table_data, linker, table_offsets);
- /* RSDP is in FSEG memory, so allocate it separately */
- rsdp = build_rsdp(linker, rsdt);
- /* Now expose it all to Guest */
- acpi_add_rom_blob(guest_info, table_data,
ACPI_BUILD_TABLE_FILE, 0x10000);- acpi_add_rom_blob(guest_info, linker,
"etc/linker-script", TARGET_PAGE_SIZE);- /*
* RSDP is small so it's easy to keep it immutable, no need to* bother with ROM blobs.*/- fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE,
rsdp->data, acpi_data_len(rsdp));- /* Cleanup GArray wrappers and memory if no longer used. */
- bios_linker_cleanup(linker);
- g_array_free(table_offsets, true);
- g_array_free(rsdp, false);
- g_array_free(table_data, false);
+} diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h new file mode 100644 index 0000000..e920229 --- /dev/null +++ b/hw/i386/acpi-defs.h @@ -0,0 +1,327 @@ +/*
- 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/.
- */
+#ifndef QEMU_ACPI_DEFS_H +#define QEMU_ACPI_DEFS_H
+enum {
- ACPI_FADT_F_WBINVD,
- ACPI_FADT_F_WBINVD_FLUSH,
- ACPI_FADT_F_PROC_C1,
- ACPI_FADT_F_P_LVL2_UP,
- ACPI_FADT_F_PWR_BUTTON,
- ACPI_FADT_F_SLP_BUTTON,
- ACPI_FADT_F_FIX_RTC,
- ACPI_FADT_F_RTC_S4,
- ACPI_FADT_F_TMR_VAL_EXT,
- ACPI_FADT_F_DCK_CAP,
- ACPI_FADT_F_RESET_REG_SUP,
- ACPI_FADT_F_SEALED_CASE,
- ACPI_FADT_F_HEADLESS,
- ACPI_FADT_F_CPU_SW_SLP,
- ACPI_FADT_F_PCI_EXP_WAK,
- ACPI_FADT_F_USE_PLATFORM_CLOCK,
- ACPI_FADT_F_S4_RTC_STS_VALID,
- ACPI_FADT_F_REMOTE_POWER_ON_CAPABLE,
- ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL,
- ACPI_FADT_F_FORCE_APIC_PHYSICAL_DESTINATION_MODE,
- ACPI_FADT_F_HW_REDUCED_ACPI,
- ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE,
+};
+/*
- ACPI 2.0 Generic Address Space definition.
- */
+struct Acpi20GenericAddress {
- uint8_t address_space_id;
- uint8_t register_bit_width;
- uint8_t register_bit_offset;
- uint8_t reserved;
- uint64_t address;
+} QEMU_PACKED; +typedef struct Acpi20GenericAddress Acpi20GenericAddress;
+#define ACPI_RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "
+struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */
- uint64_t signature; /* ACPI signature, contains "RSD PTR " */
- uint8_t checksum; /* To make sum of struct == 0 */
- uint8_t oem_id [6]; /* OEM identification */
- uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */
- uint32_t rsdt_physical_address; /* 32-bit physical address of RSDT */
- uint32_t length; /* XSDT Length in bytes including hdr */
- uint64_t xsdt_physical_address; /* 64-bit physical address of XSDT */
- uint8_t extended_checksum; /* Checksum of entire table */
- uint8_t reserved [3]; /* Reserved field must be 0 */
+} QEMU_PACKED; +typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor;
+/* Table structure from Linux kernel (the ACPI tables are under the
- BSD license) */
+#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \
- uint32_t signature; /* ACPI signature (4 ASCII characters) */ \
- uint32_t length; /* Length of table, in bytes, including header */ \
- uint8_t revision; /* ACPI Specification minor version # */ \
- uint8_t checksum; /* To make sum of entire table == 0 */ \
- uint8_t oem_id [6]; /* OEM identification */ \
- uint8_t oem_table_id [8]; /* OEM table identification */ \
- uint32_t oem_revision; /* OEM revision number */ \
- uint8_t asl_compiler_id [4]; /* ASL compiler vendor ID */ \
- uint32_t asl_compiler_revision; /* ASL compiler revision number */
+struct AcpiTableHeader /* ACPI common table header */ +{
- ACPI_TABLE_HEADER_DEF
+} QEMU_PACKED; +typedef struct AcpiTableHeader AcpiTableHeader;
+/*
- ACPI 1.0 Fixed ACPI Description Table (FADT)
- */
+#define ACPI_FACP_SIGNATURE 0x50434146 // FACP +struct AcpiFadtDescriptorRev1 +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t firmware_ctrl; /* Physical address of FACS */
- uint32_t dsdt; /* Physical address of DSDT */
- uint8_t model; /* System Interrupt Model */
- uint8_t reserved1; /* Reserved */
- uint16_t sci_int; /* System vector of SCI interrupt */
- uint32_t smi_cmd; /* Port address of SMI command port */
- uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */
- uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */
- uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */
- uint8_t reserved2; /* Reserved - must be zero */
- uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */
- uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */
- uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */
- uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */
- uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */
- uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */
- uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */
- uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */
- uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */
- uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */
- uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */
- uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */
- uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */
- uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */
- uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */
- uint8_t reserved3; /* Reserved */
- uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */
- uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */
- uint16_t flush_size; /* Size of area read to flush caches */
- uint16_t flush_stride; /* Stride used in flushing caches */
- uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */
- uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */
- uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */
- uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */
- uint8_t century; /* Index to century in RTC CMOS RAM */
- uint8_t reserved4; /* Reserved */
- uint8_t reserved4a; /* Reserved */
- uint8_t reserved4b; /* Reserved */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1;
+/*
- ACPI 1.0 Root System Description Table (RSDT)
- */
+#define ACPI_RSDT_SIGNATURE 0x54445352 // RSDT +struct AcpiRsdtDescriptorRev1 +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t table_offset_entry[0]; /* Array of pointers to other */
- /* ACPI tables */
+} QEMU_PACKED; +typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;
+/*
- ACPI 1.0 Firmware ACPI Control Structure (FACS)
- */
+#define ACPI_FACS_SIGNATURE 0x53434146 // FACS +struct AcpiFacsDescriptorRev1 +{
- uint32_t signature; /* ACPI Signature */
- uint32_t length; /* Length of structure, in bytes */
- uint32_t hardware_signature; /* Hardware configuration signature */
- uint32_t firmware_waking_vector; /* ACPI OS waking vector */
- uint32_t global_lock; /* Global Lock */
- uint32_t flags;
- uint8_t resverved3 [40]; /* Reserved - must be zero */
+} QEMU_PACKED; +typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;
+/*
- Differentiated System Description Table (DSDT)
- */
+#define ACPI_DSDT_SIGNATURE 0x54445344 // DSDT
+/*
- MADT values and structures
- */
+/* Values for MADT PCATCompat */
+#define ACPI_DUAL_PIC 0 +#define ACPI_MULTIPLE_APIC 1
+/* Master MADT */
+#define ACPI_APIC_SIGNATURE 0x43495041 // APIC +struct AcpiMultipleApicTable +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t local_apic_address; /* Physical address of local APIC */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiMultipleApicTable AcpiMultipleApicTable;
+/* Values for Type in APIC sub-headers */
+#define ACPI_APIC_PROCESSOR 0 +#define ACPI_APIC_IO 1 +#define ACPI_APIC_XRUPT_OVERRIDE 2 +#define ACPI_APIC_NMI 3 +#define ACPI_APIC_LOCAL_NMI 4 +#define ACPI_APIC_ADDRESS_OVERRIDE 5 +#define ACPI_APIC_IO_SAPIC 6 +#define ACPI_APIC_LOCAL_SAPIC 7 +#define ACPI_APIC_XRUPT_SOURCE 8 +#define ACPI_APIC_RESERVED 9 /* 9 and greater are reserved */
+/*
- MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE)
- */
+#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\
- uint8_t type; \
- uint8_t length;
+/* Sub-structures for MADT */
+struct AcpiMadtProcessorApic +{
- ACPI_SUB_HEADER_DEF
- uint8_t processor_id; /* ACPI processor id */
- uint8_t local_apic_id; /* Processor's local APIC id */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic;
+struct AcpiMadtIoApic +{
- ACPI_SUB_HEADER_DEF
- uint8_t io_apic_id; /* I/O APIC ID */
- uint8_t reserved; /* Reserved - must be zero */
- uint32_t address; /* APIC physical address */
- uint32_t interrupt; /* Global system interrupt where INTI
* lines start */+} QEMU_PACKED; +typedef struct AcpiMadtIoApic AcpiMadtIoApic;
+struct AcpiMadtIntsrcovr {
- ACPI_SUB_HEADER_DEF
- uint8_t bus;
- uint8_t source;
- uint32_t gsi;
- uint16_t flags;
+} QEMU_PACKED; +typedef struct AcpiMadtIntsrcovr AcpiMadtIntsrcovr;
+struct AcpiMadtLocalNmi {
- ACPI_SUB_HEADER_DEF
- uint8_t processor_id; /* ACPI processor id */
- uint16_t flags; /* MPS INTI flags */
- uint8_t lint; /* Local APIC LINT# */
+} QEMU_PACKED; +typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi;
+/*
- HPET Description Table
- */
+#define ACPI_HPET_SIGNATURE 0x54455048 // HPET +struct Acpi20Hpet {
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t timer_block_id;
- Acpi20GenericAddress addr;
- uint8_t hpet_number;
- uint16_t min_tick;
- uint8_t page_protect;
+} QEMU_PACKED; +typedef struct Acpi20Hpet Acpi20Hpet;
+/*
- SRAT (NUMA topology description) table
- */
+#define ACPI_SRAT_SIGNATURE 0x54415253 // SRAT +struct AcpiSystemResourceAffinityTable +{
- ACPI_TABLE_HEADER_DEF
- uint32_t reserved1;
- uint32_t reserved2[2];
+} QEMU_PACKED; +typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable;
+#define ACPI_SRAT_PROCESSOR 0 +#define ACPI_SRAT_MEMORY 1
+struct AcpiSratProcessorAffinity +{
- ACPI_SUB_HEADER_DEF
- uint8_t proximity_lo;
- uint8_t local_apic_id;
- uint32_t flags;
- uint8_t local_sapic_eid;
- uint8_t proximity_hi[3];
- uint32_t reserved;
+} QEMU_PACKED; +typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity;
+struct AcpiSratMemoryAffinity +{
- ACPI_SUB_HEADER_DEF
- uint8_t proximity[4];
- uint16_t reserved1;
- uint64_t base_addr;
- uint64_t range_length;
- uint32_t reserved2;
- uint32_t flags;
- uint32_t reserved3[2];
+} QEMU_PACKED; +typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity;
+/* PCI fw r3.0 MCFG table. */ +/* Subtable */ +struct AcpiMcfgAllocation {
- uint64_t address; /* Base address, processor-relative */
- uint16_t pci_segment; /* PCI segment group number */
- uint8_t start_bus_number; /* Starting PCI Bus number */
- uint8_t end_bus_number; /* Final PCI Bus number */
- uint32_t reserved;
+} QEMU_PACKED; +typedef struct AcpiMcfgAllocation AcpiMcfgAllocation;
+#define ACPI_MCFG_SIGNATURE 0x4746434d // MCFG +struct AcpiTableMcfg {
- ACPI_TABLE_HEADER_DEF;
- uint8_t reserved[8];
- AcpiMcfgAllocation allocation[0];
+} QEMU_PACKED; +typedef struct AcpiTableMcfg AcpiTableMcfg;
+#endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e5ebfa5..9f9207d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -55,6 +55,7 @@ #include "hw/acpi/acpi.h" #include "hw/cpu/icc_bus.h" #include "hw/boards.h" +#include "hw/i386/acpi-build.h"
/* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1045,6 +1046,7 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) PcGuestInfoState, machine_done); pc_fw_cfg_guest_info(&guest_info_state->info);
- acpi_setup(&guest_info_state->info);
}
PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3c2541a..ab176ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, @@ -125,6 +126,7 @@ static void pc_init1(MemoryRegion *system_memory,
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
- guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof AcpiDsdtAmlCode;
@@ -269,6 +271,7 @@ static void pc_init_pci(QEMUMachineInitArgs *args) static void pc_init_pci_1_5(QEMUMachineInitArgs *args) { has_pci_info = false;
- has_acpi_build = false; pc_init_pci(args);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 50afe7c..9539807 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -50,6 +50,7 @@
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_q35_init(QEMUMachineInitArgs *args) @@ -111,6 +112,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info;
- guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = Q35AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
@@ -221,6 +223,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) static void pc_q35_init_1_5(QEMUMachineInitArgs *args) { has_pci_info = false;
- has_acpi_build = false; pc_q35_init(args);
}
diff --git a/hw/i386/ssdt-misc.dsl b/hw/i386/ssdt-misc.dsl index ac11e96..a4484b8 100644 --- a/hw/i386/ssdt-misc.dsl +++ b/hw/i386/ssdt-misc.dsl @@ -70,4 +70,50 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) Zero /* reserved */ }) }
- External(_SB.PCI0, DeviceObj)
- External(_SB.PCI0.ISA, DeviceObj)
- Scope(_SB.PCI0.ISA) {
Device(PEVT) {Name(_HID, "QEMU0001")/* PEST will be patched to be Zero if no such device */ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pestName(PEST, 0xFFFF)OperationRegion(PEOR, SystemIO, PEST, 0x01)Field(PEOR, ByteAcc, NoLock, Preserve) {PEPT, 8,}Method(_STA, 0, NotSerialized) {Store(PEST, Local0)If (LEqual(Local0, Zero)) {Return (0x00)} Else {Return (0x0F)}}Method(RDPT, 0, NotSerialized) {Store(PEPT, Local0)Return (Local0)}Method(WRPT, 1, NotSerialized) {Store(Arg0, PEPT)}Name(_CRS, ResourceTemplate() {IO(Decode16, 0x00, 0x00, 0x01, 0x01, IO)})CreateWordField(_CRS, IO._MIN, IOMN)CreateWordField(_CRS, IO._MAX, IOMX)Method(_INI, 0, NotSerialized) {Store(PEST, IOMN)Store(PEST, IOMX)}}- }
} diff --git a/include/hw/i386/acpi-build.h b/include/hw/i386/acpi-build.h new file mode 100644 index 0000000..e57b1aa --- /dev/null +++ b/include/hw/i386/acpi-build.h @@ -0,0 +1,9 @@
+#ifndef HW_I386_ACPI_BUILD_H +#define HW_I386_ACPI_BUILD_H
+#include "qemu/typedefs.h"
+void acpi_setup(PcGuestInfo *);
+#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b29c8f6..02cc559 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -51,6 +51,7 @@ struct PcGuestInfo { unsigned dsdt_size; uint16_t pvpanic_port; FWCfgState *fw_cfg;
- bool has_acpi_build;
};
/* parallel.c */
MST
SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
On Mon, Jul 08, 2013 at 02:16:13PM -0500, Anthony Liguori wrote:
"Michael S. Tsirkin" mst@redhat.com writes:
This adds C code for generating ACPI tables at runtime, imported from seabios git tree commit 51684b7ced75fb76776e8ee84833fcfb6ecf12dd
Although ACPI tables come from a system BIOS on real hw, it makes sense that the ACPI tables are coupled with the virtual machine, since they have to abstract the x86 machine to the OS's.
This is widely desired as a way to avoid the churn and proliferation of QEMU-specific interfaces associated with ACPI tables in bios code.
Notes: The code structure was intentionally kept as close to the seabios original as possible, to simplify comparison and making sure we didn't lose anything in translation.
Minor code duplication results, to help ensure there are no functional regressions, I think it's better to merge it like this and do more code changes in follow-up patches.
Cross-version compatibility concerns have been addressed: ACPI tables are exposed to guest as FW_CFG entries. When running with -M 1.5 and older, this patch disables ACPI table generation, and doesn't expose ACPI tables to guest.
As table content is likely to change over time, the following measures are taken to simplify cross-version migration: - All tables besides the RSDP are packed in a single FW CFG entry. This entry size is currently 23K. We round it up to 64K to avoid too much churn there. - Tables are placed in special ROM blob (not mapped into guest memory) which is automatically migrated together with the guest, same as BIOS code.This seems reasonable.
This patch reuses some code from SeaBIOS, which was originally under LGPLv2 and then relicensed to GPLv3 or LGPLv3, in QEMU under GPLv2+. This relicensing has been acked by all contributors that had contributed to the code since the v2->v3 relicense. ACKs approving the v2+ relicensing are listed below. The list might include ACKs from people not holding copyright on any parts of the reused code, but it's better to err on the side of caution and include them.
Thank you for collecting the Acks.
Affected SeaBIOS files (GPLv2+ license headers added) http://thread.gmane.org/gmane.comp.bios.coreboot.seabios/5949:
src/acpi-dsdt-cpu-hotplug.dsl src/acpi-dsdt-dbug.dsl src/acpi-dsdt-hpet.dsl src/acpi-dsdt-isa.dsl src/acpi-dsdt-pci-crs.dsl src/acpi.c src/acpi.h src/ssdt-misc.dsl src/ssdt-pcihp.dsl src/ssdt-proc.dsl tools/acpi_extract.py tools/acpi_extract_preprocess.py
Each one of the listed people agreed to the following:
If you allow the use of your contribution in QEMU under the terms of GPLv2 or later as proposed by this patch, please respond to this mail including the line:
Acked-by: Name <email address>
Acked-by: Gerd Hoffmann kraxel@redhat.com Acked-by: Jan Kiszka jan.kiszka@siemens.com Acked-by: Jason Baron jbaron@akamai.com Acked-by: David Woodhouse David.Woodhouse@intel.com Acked-by: Gleb Natapov gleb@redhat.com Acked-by: Marcelo Tosatti mtosatti@redhat.com Acked-by: Dave Frodin dave.frodin@se-eng.com Acked-by: Paolo Bonzini pbonzini@redhat.com Acked-by: Kevin O'Connor kevin@koconnor.net Acked-by: Laszlo Ersek lersek@redhat.com Acked-by: Kenji Kaneshige kaneshige.kenji@jp.fujitsu.com Acked-by: Isaku Yamahata yamahata@valinux.co.jp Acked-by: Magnus Christensson magnus.christensson@intel.com Acked-by: Hu Tao hutao@cn.fujitsu.com Acked-by: Eduardo Habkost ehabkost@redhat.com
Signed-off-by: Michael S. Tsirkin mst@redhat.com
hw/i386/Makefile.objs | 2 + hw/i386/acpi-build.c | 723 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-defs.h | 327 +++++++++++++++++++ hw/i386/pc.c | 2 + hw/i386/pc_piix.c | 3 + hw/i386/pc_q35.c | 3 + hw/i386/ssdt-misc.dsl | 46 +++ include/hw/i386/acpi-build.h | 9 + include/hw/i386/pc.h | 1 + 9 files changed, 1116 insertions(+) create mode 100644 hw/i386/acpi-build.c create mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/i386/acpi-build.h
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index e783050..2ab2572 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,7 +4,9 @@ obj-y += pc.o pc_piix.o pc_q35.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o +obj-y += acpi-build.o obj-y += bios-linker-loader.o +hw/i386/acpi-build.o: hw/i386/acpi-build.c hw/i386/acpi-dsdt.hex hw/i386/ssdt-proc.hex hw/i386/ssdt-pcihp.hex hw/i386/ssdt-misc.hex hw/i386/q35-acpi-dsdt.hex hw/i386/pc_piix.o: hw/i386/pc_piix.c hw/i386/acpi-dsdt.hex hw/i386/pc_q35.o: hw/i386/pc_q35.c hw/i386/q35-acpi-dsdt.hex
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c new file mode 100644 index 0000000..bc44f95 --- /dev/null +++ b/hw/i386/acpi-build.c @@ -0,0 +1,723 @@ +/* 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 "hw/i386/acpi-build.h" +#include <stddef.h> +#include <glib.h> +#include "qemu/bitmap.h" +#include "qemu/range.h" +#include "hw/pci/pci.h" +#include "qom/cpu.h" +#include "hw/i386/pc.h" +#include "target-i386/cpu.h" +#include "hw/timer/hpet.h" +#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/i386/bios-linker-loader.h" +#include "hw/loader.h"
+#define ACPI_BUILD_APPNAME "Bochs" +#define ACPI_BUILD_APPNAME6 "BOCHS " +#define ACPI_BUILD_APPNAME4 "BXPC"
+#define ACPI_BUILD_DPRINTF(level, fmt, ...) do {} while(0)
+#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables" +#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
+static void +build_header(GArray *linker, GArray *table_data,
AcpiTableHeader *h, uint32_t sig, int len, uint8_t rev)+{
- h->signature = cpu_to_le32(sig);
- h->length = cpu_to_le32(len);
- h->revision = rev;
- memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6);
- memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4);
- memcpy(h->oem_table_id + 4, (void*)&sig, 4);
- h->oem_revision = cpu_to_le32(1);
- memcpy(h->asl_compiler_id, ACPI_BUILD_APPNAME4, 4);
- h->asl_compiler_revision = cpu_to_le32(1);
- h->checksum = 0;
- /* Checksum to be filled in by Guest linker */
- bios_linker_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
table_data->data, h, len, &h->checksum);+}
+#define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT */ +#define ACPI_PORT_PM_BASE 0xb000
+static inline void *acpi_data_push(GArray *table_data, unsigned size) +{
- unsigned off = table_data->len;
- g_array_set_size(table_data, off + size);
- return table_data->data + off;
+}
+static unsigned acpi_data_len(GArray *table) +{
- return table->len * g_array_get_element_size(table);
+}
+static inline void acpi_add_table(GArray *table_offsets, GArray *table_data) +{
- uint32_t offset = cpu_to_le32(table_data->len);
- g_array_append_val(table_offsets, offset);
+}
+/* FACS */ +static void +build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);
- facs->signature = cpu_to_le32(ACPI_FACS_SIGNATURE);
- facs->length = cpu_to_le32(sizeof(*facs));
+}
+/* Load chipset information into FADT */ +static void fadt_setup(AcpiFadtDescriptorRev1 *fadt, PcGuestInfo *guest_info) +{
- fadt->model = 1;
- fadt->reserved1 = 0;
- fadt->sci_int = cpu_to_le16(guest_info->sci_int);
- fadt->smi_cmd = cpu_to_le32(ACPI_PORT_SMI_CMD);
- fadt->acpi_enable = guest_info->acpi_enable_cmd;
- fadt->acpi_disable = guest_info->acpi_disable_cmd;
- fadt->pm1a_evt_blk = cpu_to_le32(ACPI_PORT_PM_BASE);
- fadt->pm1a_cnt_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x04);
- fadt->pm_tmr_blk = cpu_to_le32(ACPI_PORT_PM_BASE + 0x08);
- fadt->gpe0_blk = cpu_to_le32(guest_info->gpe0_blk);
- fadt->pm1_evt_len = 4;
- fadt->pm1_cnt_len = 2;
- fadt->pm_tmr_len = 4;
- fadt->gpe0_blk_len = guest_info->gpe0_blk_len;
- fadt->plvl2_lat = cpu_to_le16(0xfff); /* C2 state not supported */
- fadt->plvl3_lat = cpu_to_le16(0xfff); /* C3 state not supported */
- fadt->flags = cpu_to_le32((1 << ACPI_FADT_F_WBINVD) |
(1 << ACPI_FADT_F_PROC_C1) |(1 << ACPI_FADT_F_SLP_BUTTON) |(1 << ACPI_FADT_F_RTC_S4));- if (guest_info->fix_rtc) {
fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_FIX_RTC);- }
- if (guest_info->platform_timer) {
fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_USE_PLATFORM_CLOCK);- }
+}
+/* FADT */ +static void +build_fadt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info,
unsigned facs, unsigned dsdt)+{
- AcpiFadtDescriptorRev1 *fadt = acpi_data_push(table_data, sizeof(*fadt));
- fadt->firmware_ctrl = cpu_to_le32(facs);
- /* FACS address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,
table_data, &fadt->firmware_ctrl,sizeof fadt->firmware_ctrl);- fadt->dsdt = cpu_to_le32(dsdt);
- /* DSDT address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,
table_data, &fadt->dsdt,sizeof fadt->dsdt);- fadt_setup(fadt, guest_info);
- build_header(linker, table_data,
(void*)fadt, ACPI_FACP_SIGNATURE, sizeof(*fadt), 1);+}
+static void +build_madt(GArray *table_data, GArray *linker, FWCfgState *fw_cfg, PcGuestInfo *guest_info) +{
- int madt_size;
- AcpiMultipleApicTable *madt;
- AcpiMadtProcessorApic *apic;
- AcpiMadtIoApic *io_apic;
- AcpiMadtIntsrcovr *intsrcovr;
- AcpiMadtLocalNmi *local_nmi;
- madt_size = (sizeof(AcpiMultipleApicTable)
+ sizeof(AcpiMadtProcessorApic) * guest_info->apic_id_limit+ sizeof(AcpiMadtIoApic)+ sizeof(AcpiMadtIntsrcovr) * 16+ sizeof(AcpiMadtLocalNmi));- madt = acpi_data_push(table_data, madt_size);
- madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
- madt->flags = cpu_to_le32(1);
- apic = (void*)&madt[1];
- int i;
Variables belong at top of functions.
The fancy casting math is dangerous too. You're overrunning buffers and will likely confuse static checks.
Best to use a void * pointer and do the assignments based on offsets.
Absolutely, it's better. It's only like this because it's a port from seabios. In fact, I think it's best to use GArray and avoid offsets completely. But let's merge it then cleanup, this way it's easier to make sure there are no regressions.
- for (i=0; i < guest_info->apic_id_limit; i++) {
apic->type = ACPI_APIC_PROCESSOR;apic->length = sizeof(*apic);apic->processor_id = i;apic->local_apic_id = i;if (test_bit(i, guest_info->found_cpus))apic->flags = cpu_to_le32(1);elseapic->flags = cpu_to_le32(0);apic++;- }
- io_apic = (void*)apic;
- io_apic->type = ACPI_APIC_IO;
- io_apic->length = sizeof(*io_apic);
+#define ACPI_BUILD_IOAPIC_ID 0x0
- 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);
- intsrcovr = (void*)&io_apic[1];
- if (guest_info->apic_xrupt_override) {
memset(intsrcovr, 0, 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 */intsrcovr++;- }
- 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;memset(intsrcovr, 0, 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 */intsrcovr++;- }
- local_nmi = (void*)intsrcovr;
- 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 */
- local_nmi++;
- build_header(linker, table_data,
(void*)madt, ACPI_APIC_SIGNATURE,(void*)local_nmi - (void*)madt, 1);+}
+/* Encode a hex value */ +static inline char acpi_get_hex(uint32_t val) {
- val &= 0x0f;
- return (val <= 9) ? ('0' + val) : ('A' + val - 10);
+}
+/* Encode a length in an SSDT. */ +static uint8_t * +acpi_encode_len(uint8_t *ssdt_ptr, int length, int bytes) +{
- switch (bytes) {
- default:
- case 4: ssdt_ptr[3] = ((length >> 20) & 0xff);
- case 3: ssdt_ptr[2] = ((length >> 12) & 0xff);
- case 2: ssdt_ptr[1] = ((length >> 4) & 0xff);
ssdt_ptr[0] = (((bytes - 1) & 0x3) << 6) | (length & 0x0f);break;- case 1: ssdt_ptr[0] = length & 0x3f;
- }
- return ssdt_ptr + bytes;
+}
+#include "hw/i386/ssdt-proc.hex"
+/* 0x5B 0x83 ProcessorOp PkgLength NameString ProcID */ +#define ACPI_PROC_OFFSET_CPUHEX (*ssdt_proc_name - *ssdt_proc_start + 2) +#define ACPI_PROC_OFFSET_CPUID1 (*ssdt_proc_name - *ssdt_proc_start + 4) +#define ACPI_PROC_OFFSET_CPUID2 (*ssdt_proc_id - *ssdt_proc_start) +#define ACPI_PROC_SIZEOF (*ssdt_proc_end - *ssdt_proc_start) +#define ACPI_PROC_AML (ssdp_proc_aml + *ssdt_proc_start)
+/* 0x5B 0x82 DeviceOp PkgLength NameString */ +#define ACPI_PCIHP_OFFSET_HEX (*ssdt_pcihp_name - *ssdt_pcihp_start + 1) +#define ACPI_PCIHP_OFFSET_ID (*ssdt_pcihp_id - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_ADR (*ssdt_pcihp_adr - *ssdt_pcihp_start) +#define ACPI_PCIHP_OFFSET_EJ0 (*ssdt_pcihp_ej0 - *ssdt_pcihp_start) +#define ACPI_PCIHP_SIZEOF (*ssdt_pcihp_end - *ssdt_pcihp_start) +#define ACPI_PCIHP_AML (ssdp_pcihp_aml + *ssdt_pcihp_start)
+#define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */ +#define ACPI_SSDT_HEADER_LENGTH 36
+#include "hw/i386/ssdt-misc.hex" +#include "hw/i386/ssdt-pcihp.hex"
+static uint8_t* +build_notify(uint8_t *ssdt_ptr, const char *name, int skip, int count,
const char *target, int ofs)+{
- int i;
- count -= skip;
- *(ssdt_ptr++) = 0x14; /* MethodOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+5+(12*count), 2);
- memcpy(ssdt_ptr, name, 4);
- ssdt_ptr += 4;
- *(ssdt_ptr++) = 0x02; /* MethodOp */
- for (i = skip; count-- > 0; i++) {
*(ssdt_ptr++) = 0xA0; /* IfOp */ssdt_ptr = acpi_encode_len(ssdt_ptr, 11, 1);*(ssdt_ptr++) = 0x93; /* LEqualOp */*(ssdt_ptr++) = 0x68; /* Arg0Op */*(ssdt_ptr++) = 0x0A; /* BytePrefix */*(ssdt_ptr++) = i;*(ssdt_ptr++) = 0x86; /* NotifyOp */memcpy(ssdt_ptr, target, 4);ssdt_ptr[ofs] = acpi_get_hex(i >> 4);ssdt_ptr[ofs + 1] = acpi_get_hex(i);ssdt_ptr += 4;*(ssdt_ptr++) = 0x69; /* Arg1Op */- }
- return ssdt_ptr;
+}
+static void patch_pcihp(int slot, uint8_t *ssdt_ptr, uint32_t eject) +{
- ssdt_ptr[ACPI_PCIHP_OFFSET_HEX] = acpi_get_hex(slot >> 4);
- ssdt_ptr[ACPI_PCIHP_OFFSET_HEX+1] = acpi_get_hex(slot);
- ssdt_ptr[ACPI_PCIHP_OFFSET_ID] = slot;
- ssdt_ptr[ACPI_PCIHP_OFFSET_ADR + 2] = slot;
- /* Runtime patching of ACPI_EJ0: to disable hotplug for a slot,
* replace the method name: _EJ0 by ACPI_EJ0_. */- /* Sanity check */
- assert (!memcmp(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "_EJ0", 4));
- if (!eject) {
memcpy(ssdt_ptr + ACPI_PCIHP_OFFSET_EJ0, "EJ0_", 4);- }
+}
+static void +build_ssdt(GArray *table_data, GArray *linker,
FWCfgState *fw_cfg, PcGuestInfo *guest_info)+{
- int acpi_cpus = MIN(0xff, guest_info->apic_id_limit);
- int length = (sizeof(ssdp_misc_aml) /* _S3_ / _S4_ / _S5_ */
+ (1+3+4) /* Scope(_SB_) */+ (acpi_cpus * ACPI_PROC_SIZEOF) /* procs */+ (1+2+5+(12*acpi_cpus)) /* NTFY */+ (6+2+1+(1*acpi_cpus)) /* CPON */+ (1+3+4) /* Scope(PCI0) */+ ((PCI_SLOT_MAX - 1) * ACPI_PCIHP_SIZEOF) /* slots */+ (1+2+5+(12*(PCI_SLOT_MAX - 1)))); /* PCNT */- uint8_t *ssdt = acpi_data_push(table_data, length);
- uint8_t *ssdt_ptr = ssdt;
- /* Copy header and encode fwcfg values in the S3_ / S4_ / S5_ packages */
- memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml));
- if (guest_info->s3_disabled) {
ssdt_ptr[acpi_s3_name[0]] = 'X';- }
- if (guest_info->s4_disabled) {
ssdt_ptr[acpi_s4_name[0]] = 'X';- } else {
ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt[acpi_s4_pkg[0] + 3] =guest_info->s4_val;- }
- *(uint32_t*)&ssdt_ptr[acpi_pci32_start[0]] =
cpu_to_le32(guest_info->pci_info.w32.begin);- *(uint32_t*)&ssdt_ptr[acpi_pci32_end[0]] =
cpu_to_le32(guest_info->pci_info.w32.end - 1);I don't think you're guaranteed natural alignment here so you need to use memcpys.
Regards,
Anthony Liguori
- if (guest_info->pci_info.w64.end > guest_info->pci_info.w64.begin) {
ssdt_ptr[acpi_pci64_valid[0]] = 1;*(uint64_t*)&ssdt_ptr[acpi_pci64_start[0]] =cpu_to_le64(guest_info->pci_info.w64.begin);*(uint64_t*)&ssdt_ptr[acpi_pci64_end[0]] =cpu_to_le64(guest_info->pci_info.w64.end - 1);*(uint64_t*)&ssdt_ptr[acpi_pci64_length[0]] =cpu_to_le64(guest_info->pci_info.w64.end -guest_info->pci_info.w64.begin);- } else {
ssdt_ptr[acpi_pci64_valid[0]] = 0;- }
- *(uint16_t *)(ssdt_ptr + *ssdt_isa_pest) =
cpu_to_le16(guest_info->pvpanic_port);- ssdt_ptr += sizeof(ssdp_misc_aml);
- /* build Scope(_SB_) header */
- *(ssdt_ptr++) = 0x10; /* ScopeOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3);
- *(ssdt_ptr++) = '_';
- *(ssdt_ptr++) = 'S';
- *(ssdt_ptr++) = 'B';
- *(ssdt_ptr++) = '_';
- /* build Processor object for each processor */
- int i;
- for (i=0; i<acpi_cpus; i++) {
memcpy(ssdt_ptr, ACPI_PROC_AML, ACPI_PROC_SIZEOF);ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX] = acpi_get_hex(i >> 4);ssdt_ptr[ACPI_PROC_OFFSET_CPUHEX+1] = acpi_get_hex(i);ssdt_ptr[ACPI_PROC_OFFSET_CPUID1] = i;ssdt_ptr[ACPI_PROC_OFFSET_CPUID2] = i;ssdt_ptr += ACPI_PROC_SIZEOF;- }
- /* build "Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...}" */
- /* Arg0 = Processor ID = APIC ID */
- ssdt_ptr = build_notify(ssdt_ptr, "NTFY", 0, acpi_cpus, "CP00", 2);
- /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" */
- *(ssdt_ptr++) = 0x08; /* NameOp */
- *(ssdt_ptr++) = 'C';
- *(ssdt_ptr++) = 'P';
- *(ssdt_ptr++) = 'O';
- *(ssdt_ptr++) = 'N';
- *(ssdt_ptr++) = 0x12; /* PackageOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, 2+1+(1*acpi_cpus), 2);
- *(ssdt_ptr++) = acpi_cpus;
- for (i=0; i<acpi_cpus; i++)
*(ssdt_ptr++) = (test_bit(i, guest_info->found_cpus)) ? 0x01 : 0x00;- /* build Scope(PCI0) opcode */
- *(ssdt_ptr++) = 0x10; /* ScopeOp */
- ssdt_ptr = acpi_encode_len(ssdt_ptr, length - (ssdt_ptr - ssdt), 3);
- *(ssdt_ptr++) = 'P';
- *(ssdt_ptr++) = 'C';
- *(ssdt_ptr++) = 'I';
- *(ssdt_ptr++) = '0';
- /* build Device object for each slot */
- for (i = 1; i < PCI_SLOT_MAX; i++) {
bool eject = test_bit(i, guest_info->slot_hotplug_enable);memcpy(ssdt_ptr, ACPI_PCIHP_AML, ACPI_PCIHP_SIZEOF);patch_pcihp(i, ssdt_ptr, eject);ssdt_ptr += ACPI_PCIHP_SIZEOF;- }
- ssdt_ptr = build_notify(ssdt_ptr, "PCNT", 1, PCI_SLOT_MAX, "S00_", 1);
- build_header(linker, table_data,
(void*)ssdt, ACPI_SSDT_SIGNATURE, ssdt_ptr - ssdt, 1);+}
+static void +build_hpet(GArray *table_data, GArray *linker) +{
- Acpi20Hpet *hpet;
- hpet = acpi_data_push(table_data, sizeof(*hpet));
- /* Note timer_block_id value must be kept in sync with value advertised by
* emulated hpet*/- hpet->timer_block_id = cpu_to_le32(0x8086a201);
- hpet->addr.address = cpu_to_le64(HPET_BASE);
- build_header(linker, table_data,
(void*)hpet, ACPI_HPET_SIGNATURE, sizeof(*hpet), 1);+}
+static void +acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem,
uint64_t base, uint64_t len, int node, int enabled)+{
- numamem->type = ACPI_SRAT_MEMORY;
- numamem->length = sizeof(*numamem);
- memset(numamem->proximity, 0, 4);
- numamem->proximity[0] = node;
- numamem->flags = cpu_to_le32(!!enabled);
- numamem->base_addr = cpu_to_le64(base);
- numamem->range_length = cpu_to_le64(len);
+}
+static void +build_srat(GArray *table_data, GArray *linker,
FWCfgState *fw_cfg, PcGuestInfo *guest_info)+{
- AcpiSystemResourceAffinityTable *srat;
- AcpiSratProcessorAffinity *core;
- AcpiSratMemoryAffinity *numamem;
- int i;
- uint64_t curnode;
- int srat_size;
- int slots;
- uint64_t mem_len, mem_base, next_base;
- srat_size = sizeof(*srat) +
sizeof(AcpiSratProcessorAffinity) * guest_info->apic_id_limit +sizeof(AcpiSratMemoryAffinity) * (guest_info->numa_nodes + 2);- srat = acpi_data_push(table_data, srat_size);
- srat->reserved1 = cpu_to_le32(1);
- core = (void*)(srat + 1);
- for (i = 0; i < guest_info->apic_id_limit; ++i) {
core->type = ACPI_SRAT_PROCESSOR;core->length = sizeof(*core);core->local_apic_id = i;curnode = guest_info->node_cpu[i];core->proximity_lo = curnode;memset(core->proximity_hi, 0, 3);core->local_sapic_eid = 0;if (test_bit(i, guest_info->found_cpus))core->flags = cpu_to_le32(1);elsecore->flags = cpu_to_le32(0);core++;- }
- /* the memory map is a bit tricky, it contains at least one hole
* from 640k-1M and possibly another one from 3.5G-4G.*/- numamem = (void*)core;
- slots = 0;
- next_base = 0;
- acpi_build_srat_memory(numamem, 0, 640*1024, 0, 1);
- next_base = 1024 * 1024;
- numamem++;
- slots++;
- for (i = 1; i < guest_info->numa_nodes + 1; ++i) {
mem_base = next_base;mem_len = guest_info->node_mem[i - 1];if (i == 1)mem_len -= 1024 * 1024;next_base = mem_base + mem_len;/* Cut out the ACPI_PCI hole */if (mem_base <= guest_info->ram_size &&next_base > guest_info->ram_size) {mem_len -= next_base - guest_info->ram_size;if (mem_len > 0) {acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1);numamem++;slots++;}mem_base = 1ULL << 32;mem_len = next_base - guest_info->ram_size;next_base += (1ULL << 32) - guest_info->ram_size;}acpi_build_srat_memory(numamem, mem_base, mem_len, i-1, 1);numamem++;slots++;- }
- for (; slots < guest_info->numa_nodes + 2; slots++) {
acpi_build_srat_memory(numamem, 0, 0, 0, 0);numamem++;- }
- build_header(linker, table_data,
(void*)srat, ACPI_SRAT_SIGNATURE, srat_size, 1);+}
+static void +build_mcfg_q35(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- AcpiTableMcfg *mcfg;
- int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]);
- mcfg = acpi_data_push(table_data, len);
- mcfg->allocation[0].address = cpu_to_le64(guest_info->mcfg_base);
- /* Only a single allocation so no need to play with segments */
- mcfg->allocation[0].pci_segment = cpu_to_le16(0);
- mcfg->allocation[0].start_bus_number = 0;
- mcfg->allocation[0].end_bus_number = 0xFF;
- build_header(linker, table_data, (void *)mcfg, ACPI_MCFG_SIGNATURE, len, 1);
+}
+static void +build_dsdt(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +{
- void *dsdt;
- assert(guest_info->dsdt_code && guest_info->dsdt_size);
- dsdt = acpi_data_push(table_data, guest_info->dsdt_size);
- memcpy(dsdt, guest_info->dsdt_code, guest_info->dsdt_size);
+}
+/* Build final rsdt table */ +static void +build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets) +{
- AcpiRsdtDescriptorRev1 *rsdt;
- size_t rsdt_len;
- int i;
- rsdt_len = sizeof(*rsdt) + sizeof(uint32_t) * table_offsets->len;
- rsdt = acpi_data_push(table_data, rsdt_len);
- memcpy(rsdt->table_offset_entry, table_offsets->data,
sizeof(uint32_t) * table_offsets->len);- for (i = 0; i < table_offsets->len; ++i) {
/* rsdt->table_offset_entry to be filled by Guest linker */bios_linker_add_pointer(linker,ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_FILE,table_data, &rsdt->table_offset_entry[i],sizeof(uint32_t));- }
- build_header(linker, table_data,
(void*)rsdt, ACPI_RSDT_SIGNATURE, rsdt_len, 1);+}
+static GArray * +build_rsdp(GArray *linker, unsigned rsdt) +{
- GArray *rsdp_table;
- AcpiRsdpDescriptor *rsdp;
- rsdp_table = g_array_new(false, true /* clear */, sizeof *rsdp);
- g_array_set_size(rsdp_table, 1);
- rsdp = (void *)rsdp_table->data;
- bios_linker_alloc(linker, ACPI_BUILD_RSDP_FILE, 1, true /* fseg memory */);
- rsdp->signature = cpu_to_le64(ACPI_RSDP_SIGNATURE);
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
- rsdp->rsdt_physical_address = cpu_to_le32(rsdt);
- /* Address to be filled by Guest linker */
- bios_linker_add_pointer(linker, ACPI_BUILD_RSDP_FILE, ACPI_BUILD_TABLE_FILE,
rsdp_table, &rsdp->rsdt_physical_address,sizeof rsdp->rsdt_physical_address);- rsdp->checksum = 0;
- /* Checksum to be filled by Guest linker */
- bios_linker_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
rsdp, rsdp, sizeof *rsdp, &rsdp->checksum);- return rsdp_table;
+}
+static void acpi_add_rom_blob(PcGuestInfo *guest_info, GArray *blob,
const char *name, unsigned align)+{
- MemoryRegion *mr = g_malloc(sizeof(*mr));
- /* Align size to multiple of given size. This reduces the chance
* we need to change size in the future (breaking cross version migration).*/- g_array_set_size(blob, (ROUND_UP(acpi_data_len(blob), align) +
g_array_get_element_size(blob) - 1) /g_array_get_element_size(blob));- memory_region_init_ram_ptr(mr, name,
acpi_data_len(blob), blob->data);- memory_region_set_readonly(mr, true);
- vmstate_register_ram_global(mr);
- rom_add_blob(ACPI_BUILD_TABLE_FILE, blob->data, acpi_data_len(blob),
-1, mr);- fw_cfg_add_file(guest_info->fw_cfg, name,
blob->data, acpi_data_len(blob));+}
+#define ACPI_MAX_ACPI_TABLES 20 +void acpi_setup(PcGuestInfo *guest_info) +{
- GArray *table_data, *table_offsets, *rsdp, *linker;
- unsigned facs, dsdt, rsdt;
- if (!guest_info->fw_cfg) {
ACPI_BUILD_DPRINTF(3, "No fw cfg. Boiling out.\n");return;- }
- if (!guest_info->has_acpi_build) {
ACPI_BUILD_DPRINTF(3, "ACPI build disabled. Boiling out.\n");return;- }
- table_data = g_array_new(false, true /* clear */, 1);
- table_offsets = g_array_new(false, true /* clear */,
sizeof(uint32_t));- linker = bios_linker_init();
- ACPI_BUILD_DPRINTF(3, "init ACPI tables\n");
- bios_linker_alloc(linker, ACPI_BUILD_TABLE_FILE, 64 /* Ensure FACS is aligned */,
false /* high memory */);- /*
* FACS is pointed to by FADT.* We place it first since it's the only table that has alignment* requirements.*/- facs = table_data->len;
- build_facs(table_data, linker, guest_info);
- /* DSDT is pointed to by FADT */
- dsdt = table_data->len;
- build_dsdt(table_data, linker, guest_info);
- /* ACPI tables pointed to by RSDT */
- acpi_add_table(table_offsets, table_data);
- build_fadt(table_data, linker, guest_info, facs, dsdt);
- acpi_add_table(table_offsets, table_data);
- build_ssdt(table_data, linker, guest_info->fw_cfg, guest_info);
- acpi_add_table(table_offsets, table_data);
- build_madt(table_data, linker, guest_info->fw_cfg, guest_info);
- acpi_add_table(table_offsets, table_data);
- if (guest_info->has_hpet) {
build_hpet(table_data, linker);- }
- if (guest_info->numa_nodes) {
acpi_add_table(table_offsets, table_data);build_srat(table_data, linker, guest_info->fw_cfg, guest_info);- }
- if (guest_info->mcfg_base) {
acpi_add_table(table_offsets, table_data);build_mcfg_q35(table_data, linker, guest_info);- }
- /* RSDT is pointed to by RSDP */
- rsdt = table_data->len;
- build_rsdt(table_data, linker, table_offsets);
- /* RSDP is in FSEG memory, so allocate it separately */
- rsdp = build_rsdp(linker, rsdt);
- /* Now expose it all to Guest */
- acpi_add_rom_blob(guest_info, table_data,
ACPI_BUILD_TABLE_FILE, 0x10000);- acpi_add_rom_blob(guest_info, linker,
"etc/linker-script", TARGET_PAGE_SIZE);- /*
* RSDP is small so it's easy to keep it immutable, no need to* bother with ROM blobs.*/- fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE,
rsdp->data, acpi_data_len(rsdp));- /* Cleanup GArray wrappers and memory if no longer used. */
- bios_linker_cleanup(linker);
- g_array_free(table_offsets, true);
- g_array_free(rsdp, false);
- g_array_free(table_data, false);
+} diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h new file mode 100644 index 0000000..e920229 --- /dev/null +++ b/hw/i386/acpi-defs.h @@ -0,0 +1,327 @@ +/*
- 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/.
- */
+#ifndef QEMU_ACPI_DEFS_H +#define QEMU_ACPI_DEFS_H
+enum {
- ACPI_FADT_F_WBINVD,
- ACPI_FADT_F_WBINVD_FLUSH,
- ACPI_FADT_F_PROC_C1,
- ACPI_FADT_F_P_LVL2_UP,
- ACPI_FADT_F_PWR_BUTTON,
- ACPI_FADT_F_SLP_BUTTON,
- ACPI_FADT_F_FIX_RTC,
- ACPI_FADT_F_RTC_S4,
- ACPI_FADT_F_TMR_VAL_EXT,
- ACPI_FADT_F_DCK_CAP,
- ACPI_FADT_F_RESET_REG_SUP,
- ACPI_FADT_F_SEALED_CASE,
- ACPI_FADT_F_HEADLESS,
- ACPI_FADT_F_CPU_SW_SLP,
- ACPI_FADT_F_PCI_EXP_WAK,
- ACPI_FADT_F_USE_PLATFORM_CLOCK,
- ACPI_FADT_F_S4_RTC_STS_VALID,
- ACPI_FADT_F_REMOTE_POWER_ON_CAPABLE,
- ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL,
- ACPI_FADT_F_FORCE_APIC_PHYSICAL_DESTINATION_MODE,
- ACPI_FADT_F_HW_REDUCED_ACPI,
- ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE,
+};
+/*
- ACPI 2.0 Generic Address Space definition.
- */
+struct Acpi20GenericAddress {
- uint8_t address_space_id;
- uint8_t register_bit_width;
- uint8_t register_bit_offset;
- uint8_t reserved;
- uint64_t address;
+} QEMU_PACKED; +typedef struct Acpi20GenericAddress Acpi20GenericAddress;
+#define ACPI_RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "
+struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */
- uint64_t signature; /* ACPI signature, contains "RSD PTR " */
- uint8_t checksum; /* To make sum of struct == 0 */
- uint8_t oem_id [6]; /* OEM identification */
- uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */
- uint32_t rsdt_physical_address; /* 32-bit physical address of RSDT */
- uint32_t length; /* XSDT Length in bytes including hdr */
- uint64_t xsdt_physical_address; /* 64-bit physical address of XSDT */
- uint8_t extended_checksum; /* Checksum of entire table */
- uint8_t reserved [3]; /* Reserved field must be 0 */
+} QEMU_PACKED; +typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor;
+/* Table structure from Linux kernel (the ACPI tables are under the
- BSD license) */
+#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \
- uint32_t signature; /* ACPI signature (4 ASCII characters) */ \
- uint32_t length; /* Length of table, in bytes, including header */ \
- uint8_t revision; /* ACPI Specification minor version # */ \
- uint8_t checksum; /* To make sum of entire table == 0 */ \
- uint8_t oem_id [6]; /* OEM identification */ \
- uint8_t oem_table_id [8]; /* OEM table identification */ \
- uint32_t oem_revision; /* OEM revision number */ \
- uint8_t asl_compiler_id [4]; /* ASL compiler vendor ID */ \
- uint32_t asl_compiler_revision; /* ASL compiler revision number */
+struct AcpiTableHeader /* ACPI common table header */ +{
- ACPI_TABLE_HEADER_DEF
+} QEMU_PACKED; +typedef struct AcpiTableHeader AcpiTableHeader;
+/*
- ACPI 1.0 Fixed ACPI Description Table (FADT)
- */
+#define ACPI_FACP_SIGNATURE 0x50434146 // FACP +struct AcpiFadtDescriptorRev1 +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t firmware_ctrl; /* Physical address of FACS */
- uint32_t dsdt; /* Physical address of DSDT */
- uint8_t model; /* System Interrupt Model */
- uint8_t reserved1; /* Reserved */
- uint16_t sci_int; /* System vector of SCI interrupt */
- uint32_t smi_cmd; /* Port address of SMI command port */
- uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */
- uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */
- uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */
- uint8_t reserved2; /* Reserved - must be zero */
- uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */
- uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */
- uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */
- uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */
- uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */
- uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */
- uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */
- uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */
- uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */
- uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */
- uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */
- uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */
- uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */
- uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */
- uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */
- uint8_t reserved3; /* Reserved */
- uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */
- uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */
- uint16_t flush_size; /* Size of area read to flush caches */
- uint16_t flush_stride; /* Stride used in flushing caches */
- uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */
- uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */
- uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */
- uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */
- uint8_t century; /* Index to century in RTC CMOS RAM */
- uint8_t reserved4; /* Reserved */
- uint8_t reserved4a; /* Reserved */
- uint8_t reserved4b; /* Reserved */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1;
+/*
- ACPI 1.0 Root System Description Table (RSDT)
- */
+#define ACPI_RSDT_SIGNATURE 0x54445352 // RSDT +struct AcpiRsdtDescriptorRev1 +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t table_offset_entry[0]; /* Array of pointers to other */
- /* ACPI tables */
+} QEMU_PACKED; +typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;
+/*
- ACPI 1.0 Firmware ACPI Control Structure (FACS)
- */
+#define ACPI_FACS_SIGNATURE 0x53434146 // FACS +struct AcpiFacsDescriptorRev1 +{
- uint32_t signature; /* ACPI Signature */
- uint32_t length; /* Length of structure, in bytes */
- uint32_t hardware_signature; /* Hardware configuration signature */
- uint32_t firmware_waking_vector; /* ACPI OS waking vector */
- uint32_t global_lock; /* Global Lock */
- uint32_t flags;
- uint8_t resverved3 [40]; /* Reserved - must be zero */
+} QEMU_PACKED; +typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;
+/*
- Differentiated System Description Table (DSDT)
- */
+#define ACPI_DSDT_SIGNATURE 0x54445344 // DSDT
+/*
- MADT values and structures
- */
+/* Values for MADT PCATCompat */
+#define ACPI_DUAL_PIC 0 +#define ACPI_MULTIPLE_APIC 1
+/* Master MADT */
+#define ACPI_APIC_SIGNATURE 0x43495041 // APIC +struct AcpiMultipleApicTable +{
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t local_apic_address; /* Physical address of local APIC */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiMultipleApicTable AcpiMultipleApicTable;
+/* Values for Type in APIC sub-headers */
+#define ACPI_APIC_PROCESSOR 0 +#define ACPI_APIC_IO 1 +#define ACPI_APIC_XRUPT_OVERRIDE 2 +#define ACPI_APIC_NMI 3 +#define ACPI_APIC_LOCAL_NMI 4 +#define ACPI_APIC_ADDRESS_OVERRIDE 5 +#define ACPI_APIC_IO_SAPIC 6 +#define ACPI_APIC_LOCAL_SAPIC 7 +#define ACPI_APIC_XRUPT_SOURCE 8 +#define ACPI_APIC_RESERVED 9 /* 9 and greater are reserved */
+/*
- MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE)
- */
+#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\
- uint8_t type; \
- uint8_t length;
+/* Sub-structures for MADT */
+struct AcpiMadtProcessorApic +{
- ACPI_SUB_HEADER_DEF
- uint8_t processor_id; /* ACPI processor id */
- uint8_t local_apic_id; /* Processor's local APIC id */
- uint32_t flags;
+} QEMU_PACKED; +typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic;
+struct AcpiMadtIoApic +{
- ACPI_SUB_HEADER_DEF
- uint8_t io_apic_id; /* I/O APIC ID */
- uint8_t reserved; /* Reserved - must be zero */
- uint32_t address; /* APIC physical address */
- uint32_t interrupt; /* Global system interrupt where INTI
* lines start */+} QEMU_PACKED; +typedef struct AcpiMadtIoApic AcpiMadtIoApic;
+struct AcpiMadtIntsrcovr {
- ACPI_SUB_HEADER_DEF
- uint8_t bus;
- uint8_t source;
- uint32_t gsi;
- uint16_t flags;
+} QEMU_PACKED; +typedef struct AcpiMadtIntsrcovr AcpiMadtIntsrcovr;
+struct AcpiMadtLocalNmi {
- ACPI_SUB_HEADER_DEF
- uint8_t processor_id; /* ACPI processor id */
- uint16_t flags; /* MPS INTI flags */
- uint8_t lint; /* Local APIC LINT# */
+} QEMU_PACKED; +typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi;
+/*
- HPET Description Table
- */
+#define ACPI_HPET_SIGNATURE 0x54455048 // HPET +struct Acpi20Hpet {
- ACPI_TABLE_HEADER_DEF /* ACPI common table header */
- uint32_t timer_block_id;
- Acpi20GenericAddress addr;
- uint8_t hpet_number;
- uint16_t min_tick;
- uint8_t page_protect;
+} QEMU_PACKED; +typedef struct Acpi20Hpet Acpi20Hpet;
+/*
- SRAT (NUMA topology description) table
- */
+#define ACPI_SRAT_SIGNATURE 0x54415253 // SRAT +struct AcpiSystemResourceAffinityTable +{
- ACPI_TABLE_HEADER_DEF
- uint32_t reserved1;
- uint32_t reserved2[2];
+} QEMU_PACKED; +typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable;
+#define ACPI_SRAT_PROCESSOR 0 +#define ACPI_SRAT_MEMORY 1
+struct AcpiSratProcessorAffinity +{
- ACPI_SUB_HEADER_DEF
- uint8_t proximity_lo;
- uint8_t local_apic_id;
- uint32_t flags;
- uint8_t local_sapic_eid;
- uint8_t proximity_hi[3];
- uint32_t reserved;
+} QEMU_PACKED; +typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity;
+struct AcpiSratMemoryAffinity +{
- ACPI_SUB_HEADER_DEF
- uint8_t proximity[4];
- uint16_t reserved1;
- uint64_t base_addr;
- uint64_t range_length;
- uint32_t reserved2;
- uint32_t flags;
- uint32_t reserved3[2];
+} QEMU_PACKED; +typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity;
+/* PCI fw r3.0 MCFG table. */ +/* Subtable */ +struct AcpiMcfgAllocation {
- uint64_t address; /* Base address, processor-relative */
- uint16_t pci_segment; /* PCI segment group number */
- uint8_t start_bus_number; /* Starting PCI Bus number */
- uint8_t end_bus_number; /* Final PCI Bus number */
- uint32_t reserved;
+} QEMU_PACKED; +typedef struct AcpiMcfgAllocation AcpiMcfgAllocation;
+#define ACPI_MCFG_SIGNATURE 0x4746434d // MCFG +struct AcpiTableMcfg {
- ACPI_TABLE_HEADER_DEF;
- uint8_t reserved[8];
- AcpiMcfgAllocation allocation[0];
+} QEMU_PACKED; +typedef struct AcpiTableMcfg AcpiTableMcfg;
+#endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e5ebfa5..9f9207d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -55,6 +55,7 @@ #include "hw/acpi/acpi.h" #include "hw/cpu/icc_bus.h" #include "hw/boards.h" +#include "hw/i386/acpi-build.h"
/* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1045,6 +1046,7 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) PcGuestInfoState, machine_done); pc_fw_cfg_guest_info(&guest_info_state->info);
- acpi_setup(&guest_info_state->info);
}
PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3c2541a..ab176ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, @@ -125,6 +126,7 @@ static void pc_init1(MemoryRegion *system_memory,
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
- guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof AcpiDsdtAmlCode;
@@ -269,6 +271,7 @@ static void pc_init_pci(QEMUMachineInitArgs *args) static void pc_init_pci_1_5(QEMUMachineInitArgs *args) { has_pci_info = false;
- has_acpi_build = false; pc_init_pci(args);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 50afe7c..9539807 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -50,6 +50,7 @@
static bool has_pvpanic = true; static bool has_pci_info = true; +static bool has_acpi_build = true;
/* PC hardware initialisation */ static void pc_q35_init(QEMUMachineInitArgs *args) @@ -111,6 +112,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info->has_pci_info = has_pci_info;
- guest_info->has_acpi_build = has_acpi_build; guest_info->dsdt_code = Q35AcpiDsdtAmlCode; guest_info->dsdt_size = sizeof Q35AcpiDsdtAmlCode;
@@ -221,6 +223,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) static void pc_q35_init_1_5(QEMUMachineInitArgs *args) { has_pci_info = false;
- has_acpi_build = false; pc_q35_init(args);
}
diff --git a/hw/i386/ssdt-misc.dsl b/hw/i386/ssdt-misc.dsl index ac11e96..a4484b8 100644 --- a/hw/i386/ssdt-misc.dsl +++ b/hw/i386/ssdt-misc.dsl @@ -70,4 +70,50 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) Zero /* reserved */ }) }
- External(_SB.PCI0, DeviceObj)
- External(_SB.PCI0.ISA, DeviceObj)
- Scope(_SB.PCI0.ISA) {
Device(PEVT) {Name(_HID, "QEMU0001")/* PEST will be patched to be Zero if no such device */ACPI_EXTRACT_NAME_WORD_CONST ssdt_isa_pestName(PEST, 0xFFFF)OperationRegion(PEOR, SystemIO, PEST, 0x01)Field(PEOR, ByteAcc, NoLock, Preserve) {PEPT, 8,}Method(_STA, 0, NotSerialized) {Store(PEST, Local0)If (LEqual(Local0, Zero)) {Return (0x00)} Else {Return (0x0F)}}Method(RDPT, 0, NotSerialized) {Store(PEPT, Local0)Return (Local0)}Method(WRPT, 1, NotSerialized) {Store(Arg0, PEPT)}Name(_CRS, ResourceTemplate() {IO(Decode16, 0x00, 0x00, 0x01, 0x01, IO)})CreateWordField(_CRS, IO._MIN, IOMN)CreateWordField(_CRS, IO._MAX, IOMX)Method(_INI, 0, NotSerialized) {Store(PEST, IOMN)Store(PEST, IOMX)}}- }
} diff --git a/include/hw/i386/acpi-build.h b/include/hw/i386/acpi-build.h new file mode 100644 index 0000000..e57b1aa --- /dev/null +++ b/include/hw/i386/acpi-build.h @@ -0,0 +1,9 @@
+#ifndef HW_I386_ACPI_BUILD_H +#define HW_I386_ACPI_BUILD_H
+#include "qemu/typedefs.h"
+void acpi_setup(PcGuestInfo *);
+#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b29c8f6..02cc559 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -51,6 +51,7 @@ struct PcGuestInfo { unsigned dsdt_size; uint16_t pvpanic_port; FWCfgState *fw_cfg;
- bool has_acpi_build;
};
/* parallel.c */
MST
SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
On 07/08/13 20:30, Michael S. Tsirkin wrote:
This patchset moves all generation of ACPI tables from guest BIOS to the hypervisor.
Doesn't seem to apply on ab8bf290, can you pls rebase and repost?
Thanks Laszlo
On Tue, Jul 09, 2013 at 09:53:50AM +0200, Laszlo Ersek wrote:
On 07/08/13 20:30, Michael S. Tsirkin wrote:
This patchset moves all generation of ACPI tables from guest BIOS to the hypervisor.
Doesn't seem to apply on ab8bf290,
This is on top of pci tree for_anthony tag, hopefully that will be pulled soon.
can you pls rebase and repost?
Thanks Laszlo
Not right now, Anthony asked for some changes. If you want to test it, pls pick it from the acpi branch in my tree.
On 07/09/13 09:57, Michael S. Tsirkin wrote:
On Tue, Jul 09, 2013 at 09:53:50AM +0200, Laszlo Ersek wrote:
On 07/08/13 20:30, Michael S. Tsirkin wrote:
This patchset moves all generation of ACPI tables from guest BIOS to the hypervisor.
Doesn't seem to apply on ab8bf290,
This is on top of pci tree for_anthony tag, hopefully that will be pulled soon.
can you pls rebase and repost?
Thanks Laszlo
Not right now, Anthony asked for some changes. If you want to test it, pls pick it from the acpi branch in my tree.
I'll wait for v3 then.
BTW I agree with the test-from-the-inside approach; acpidump + iasl -d in the guest is how I used to massage OVMF's tables.
Thanks Laszlo
-
Andreas Färber -
Anthony Liguori -
Gerd Hoffmann -
Laszlo Ersek -
Michael S. Tsirkin -
Paolo Bonzini