On Thu, 21 May 2015 10:28:31 +0800 Shannon Zhao <zhaoshengl...@huawei.com> wrote:
> From: Shannon Zhao <shannon.z...@linaro.org> > > Introduce a preliminary framework in virt-acpi-build.c with the main > ACPI build functions. It exposes the generated ACPI contents to > guest over fw_cfg. > > The required ACPI v5.1 tables for ARM are: > - RSDP: Initial table that points to XSDT > - RSDT: Points to FADT GTDT MADT tables > - FADT: Generic information about the machine > - GTDT: Generic timer description table > - MADT: Multiple APIC description table > - DSDT: Holds all information about system devices/peripherals, pointed by > FADT > > Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com> > Signed-off-by: Shannon Zhao <shannon.z...@linaro.org> > Reviewed-by: Alex Bennée <alex.ben...@linaro.org> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/arm/Makefile.objs | 1 + > hw/arm/virt-acpi-build.c | 182 > +++++++++++++++++++++++++++++++++++++++ > include/hw/arm/virt-acpi-build.h | 41 +++++++++ > qemu-options.hx | 2 +- > trace-events | 3 + > 5 files changed, 228 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/virt-acpi-build.c > create mode 100644 include/hw/arm/virt-acpi-build.h > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index 2577f68..a1bfb19 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -3,6 +3,7 @@ obj-$(CONFIG_DIGIC) += digic_boards.o > obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o > obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o > obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o > +obj-$(CONFIG_ACPI) += virt-acpi-build.o > obj-y += netduino2.o > > obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > new file mode 100644 > index 0000000..b8a5bd8 > --- /dev/null > +++ b/hw/arm/virt-acpi-build.c > @@ -0,0 +1,182 @@ > +/* Support for generating ACPI tables and passing them to Guests > + * > + * ARM virt ACPI generation > + * > + * Copyright (C) 2008-2010 Kevin O'Connor <ke...@koconnor.net> > + * Copyright (C) 2006 Fabrice Bellard > + * Copyright (C) 2013 Red Hat Inc > + * > + * Author: Michael S. Tsirkin <m...@redhat.com> > + * > + * Copyright (c) 2015 HUAWEI TECHNOLOGIES CO.,LTD. > + * > + * Author: Shannon Zhao <zhaoshengl...@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu-common.h" > +#include "hw/arm/virt-acpi-build.h" > +#include "qemu/bitmap.h" > +#include "trace.h" > +#include "qom/cpu.h" > +#include "target-arm/cpu.h" > +#include "hw/acpi/acpi-defs.h" > +#include "hw/acpi/acpi.h" > +#include "hw/nvram/fw_cfg.h" > +#include "hw/acpi/bios-linker-loader.h" > +#include "hw/loader.h" > +#include "hw/hw.h" > +#include "hw/acpi/aml-build.h" > + > +typedef > +struct AcpiBuildState { > + /* Copy of table in RAM (for patching). */ > + MemoryRegion *table_mr; > + MemoryRegion *rsdp_mr; > + MemoryRegion *linker_mr; > + /* Is table patched? */ > + bool patched; > + VirtGuestInfo *guest_info; > +} AcpiBuildState; > + > +static > +void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) > +{ > + GArray *table_offsets; > + > + table_offsets = g_array_new(false, true /* clear */, > + sizeof(uint32_t)); > + > + bios_linker_loader_alloc(tables->linker, ACPI_BUILD_TABLE_FILE, > + 64, false /* high memory */); > + > + /* > + * The ACPI v5.1 tables for Hardware-reduced ACPI platform are: > + * RSDP > + * RSDT > + * FADT > + * GTDT > + * MADT > + * DSDT > + */ > + > + /* Cleanup memory that's no longer used. */ > + g_array_free(table_offsets, true); > +} > + > +static void acpi_ram_update(MemoryRegion *mr, GArray *data) > +{ > + uint32_t size = acpi_data_len(data); > + > + /* Make sure RAM size is correct - in case it got changed > + * e.g. by migration */ > + memory_region_ram_resize(mr, size, &error_abort); > + > + memcpy(memory_region_get_ram_ptr(mr), data->data, size); > + memory_region_set_dirty(mr, 0, size); > +} > + > +static void virt_acpi_build_update(void *build_opaque, uint32_t offset) > +{ > + AcpiBuildState *build_state = build_opaque; > + AcpiBuildTables tables; > + > + /* No state to update or already patched? Nothing to do. */ > + if (!build_state || build_state->patched) { > + return; > + } > + build_state->patched = true; > + > + acpi_build_tables_init(&tables); > + > + virt_acpi_build(build_state->guest_info, &tables); > + > + acpi_ram_update(build_state->table_mr, tables.table_data); > + acpi_ram_update(build_state->rsdp_mr, tables.rsdp); > + acpi_ram_update(build_state->linker_mr, tables.linker); > + > + > + acpi_build_tables_cleanup(&tables, true); > +} > + > +static void virt_acpi_build_reset(void *build_opaque) > +{ > + AcpiBuildState *build_state = build_opaque; > + build_state->patched = false; > +} > + > +static MemoryRegion *acpi_add_rom_blob(AcpiBuildState *build_state, > + GArray *blob, const char *name, > + uint64_t max_size) > +{ > + return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1, > + name, virt_acpi_build_update, build_state); > +} > + > +static const VMStateDescription vmstate_virt_acpi_build = { > + .name = "virt_acpi_build", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_BOOL(patched, AcpiBuildState), > + VMSTATE_END_OF_LIST() > + }, > +}; > + > +void virt_acpi_setup(VirtGuestInfo *guest_info) > +{ > + AcpiBuildTables tables; > + AcpiBuildState *build_state; > + > + if (!guest_info->fw_cfg) { > + trace_virt_acpi_setup(); > + return; > + } > + > + if (!acpi_enabled) { > + trace_virt_acpi_setup(); > + return; > + } > + > + build_state = g_malloc0(sizeof *build_state); > + build_state->guest_info = guest_info; > + > + acpi_build_tables_init(&tables); > + virt_acpi_build(build_state->guest_info, &tables); > + > + /* Now expose it all to Guest */ > + build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, > + ACPI_BUILD_TABLE_FILE, > + ACPI_BUILD_TABLE_MAX_SIZE); > + assert(build_state->table_mr != NULL); > + > + build_state->linker_mr = > + acpi_add_rom_blob(build_state, tables.linker, "etc/table-loader", 0); > + > + fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE, > + tables.tcpalog->data, acpi_data_len(tables.tcpalog)); > + > + build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp, > + ACPI_BUILD_RSDP_FILE, 0); > + > + qemu_register_reset(virt_acpi_build_reset, build_state); > + virt_acpi_build_reset(build_state); > + vmstate_register(NULL, 0, &vmstate_virt_acpi_build, build_state); > + > + /* Cleanup tables but don't free the memory: we track it > + * in build_state. > + */ > + acpi_build_tables_cleanup(&tables, false); > +} > diff --git a/include/hw/arm/virt-acpi-build.h > b/include/hw/arm/virt-acpi-build.h > new file mode 100644 > index 0000000..ff00121 > --- /dev/null > +++ b/include/hw/arm/virt-acpi-build.h > @@ -0,0 +1,41 @@ > +/* > + * > + * Copyright (c) 2015 HUAWEI TECHNOLOGIES CO.,LTD. > + * > + * Author: Shannon Zhao <zhaoshengl...@huawei.com> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2 or later, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope 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_VIRT_ACPI_BUILD_H > +#define QEMU_VIRT_ACPI_BUILD_H > + > +#include "qemu-common.h" > +#include "hw/arm/virt.h" > + > +typedef struct VirtGuestInfo { > + int smp_cpus; > + FWCfgState *fw_cfg; > + const MemMapEntry *memmap; > + const int *irqmap; > +} VirtGuestInfo; > + > + > +typedef struct VirtGuestInfoState { > + VirtGuestInfo info; > + Notifier machine_done; > +} VirtGuestInfoState; > + > +void virt_acpi_setup(VirtGuestInfo *guest_info); > + > +#endif > diff --git a/qemu-options.hx b/qemu-options.hx > index ec356f6..030c14f 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -1352,7 +1352,7 @@ be needed to boot from old floppy disks. > ETEXI > > DEF("no-acpi", 0, QEMU_OPTION_no_acpi, > - "-no-acpi disable ACPI\n", QEMU_ARCH_I386) > + "-no-acpi disable ACPI\n", QEMU_ARCH_I386 | QEMU_ARCH_ARM) > STEXI > @item -no-acpi > @findex -no-acpi > diff --git a/trace-events b/trace-events > index 11387c3..3bb1f04 100644 > --- a/trace-events > +++ b/trace-events > @@ -1594,3 +1594,6 @@ i8257_unregistered_dma(int nchan, int dma_pos, int > dma_len) "unregistered DMA ch > cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8 > cpu_halt(int cpu_index) "halting cpu %d" > cpu_unhalt(int cpu_index) "unhalting cpu %d" > + > +# hw/arm/virt-acpi-build.c > +virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out."
