From patchwork Wed Apr 15 13:25:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47182 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 47D712121F for ; Wed, 15 Apr 2015 13:32:28 +0000 (UTC) Received: by lamp14 with SMTP id p14sf10049871lam.3 for ; Wed, 15 Apr 2015 06:32:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=s9Wpg5R8UR28SdELfG2OCCEYswM6z7srTQgpks2I9nc=; b=UxxHsYpuJ/QbM3iIcaezcMA8eMBE7ZiFKwkunR4eNZYpHZE54Uv1Gm6yG8x82hpP5Y eJDjOY6c5WW+lx4PSLssfW60H3e3hUWHdpcoFJx7CHVlkBT8bp5A3gcbswxKT9/Z+eWY phlOy/bryWq+S41KN4xyXt0bTj7vft4TeU7nQfPJAdfTIf4x7P3MzJ6qGh0ahqNpVvIg gX0P51eJm8K/l4aD5YQMd0YxOP2VANinJ+Ro3wqCM1RAJ8F7x7IBmgtIpGTeYdgHtguq sdLK4yM7xCGV8mD0/+CUlgm6bs+Cnp+MrQeauKmA+4CJqSK6KEpUHor7qLNZeJVc77Qj N1Ng== X-Gm-Message-State: ALoCoQnfby3gJxD8AJZ6pCmQspRPtWzPaPKfAc3YNJXmbYk3XQyHkRoA3o8qybnN7zTGu+/iRjNP X-Received: by 10.112.51.68 with SMTP id i4mr5506334lbo.13.1429104747096; Wed, 15 Apr 2015 06:32:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.163.36 with SMTP id yf4ls196641lab.43.gmail; Wed, 15 Apr 2015 06:32:26 -0700 (PDT) X-Received: by 10.152.5.7 with SMTP id o7mr23631260lao.51.1429104746840; Wed, 15 Apr 2015 06:32:26 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id uj1si3933503lbb.22.2015.04.15.06.32.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 06:32:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbqq2 with SMTP id qq2so33955080lbb.3 for ; Wed, 15 Apr 2015 06:32:26 -0700 (PDT) X-Received: by 10.152.8.78 with SMTP id p14mr23967309laa.19.1429104746691; Wed, 15 Apr 2015 06:32:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp2515697lbt; Wed, 15 Apr 2015 06:32:25 -0700 (PDT) X-Received: by 10.55.54.6 with SMTP id d6mr49805103qka.77.1429104745185; Wed, 15 Apr 2015 06:32:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id bp9si4633915qcb.33.2015.04.15.06.32.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 06:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:60517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNQW-0005pi-BE for patch@linaro.org; Wed, 15 Apr 2015 09:32:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNNC-0000vK-Vk for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:29:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiNN4-0005OF-Hq for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:28:55 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:60031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNN3-0005Jq-Oj for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:28:50 -0400 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CJV19394; Wed, 15 Apr 2015 21:26:47 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Wed, 15 Apr 2015 21:26:39 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Wed, 15 Apr 2015 21:25:09 +0800 Message-ID: <1429104309-3844-21-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1429104309-3844-1-git-send-email-zhaoshenglong@huawei.com> References: <1429104309-3844-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: hangaohuai@huawei.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v5 20/20] hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Expose the needed device information to the table generation insfrastructure and register a machine_init_done notify to call virt_acpi_build(). Add CONFIG_ACPI to arm-softmmu.mak. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 3 ++ default-configs/mips-softmmu.mak | 3 ++ default-configs/mips64-softmmu.mak | 3 ++ default-configs/mips64el-softmmu.mak | 3 ++ default-configs/mipsel-softmmu.mak | 3 ++ default-configs/x86_64-softmmu.mak | 3 ++ hw/acpi/Makefile.objs | 5 ++- hw/arm/virt.c | 78 ++++++++++++++++++++++++++++++++---- hw/i2c/Makefile.objs | 2 +- 10 files changed, 94 insertions(+), 10 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index a767e4b..74f1db3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y +CONFIG_ACPI=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 6a74e00..d2de500 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_IDE_ISA=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index cce2c81..c96d42d 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 7a88a08..d229f9e 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 095de43..ea31b8b 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 0e25108..9a4462e 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 46b87dd..11019b6 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_IDE_ISA=y diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index b9fefa7..511771a 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -1,5 +1,6 @@ -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o -common-obj-$(CONFIG_ACPI) += memory_hotplug.o +common-obj-$(CONFIG_ACPI_CORE) += core.o piix4.o ich9.o pcihp.o +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o common-obj-$(CONFIG_ACPI) += acpi_interface.o common-obj-$(CONFIG_ACPI) += bios-linker-loader.o common-obj-$(CONFIG_ACPI) += aml-build.o diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b652b07..e968ad5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -43,6 +43,7 @@ #include "qemu/bitops.h" #include "qemu/error-report.h" #include "hw/pci-host/gpex.h" +#include "hw/arm/virt-acpi-build.h" #define NUM_VIRTIO_TRANSPORTS 32 @@ -60,6 +61,11 @@ #define GIC_FDT_IRQ_PPI_CPU_START 8 #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 +#define ARCH_TIMER_VIRT_IRQ 11 +#define ARCH_TIMER_S_EL1_IRQ 13 +#define ARCH_TIMER_NS_EL1_IRQ 14 +#define ARCH_TIMER_NS_EL2_IRQ 10 + enum { VIRT_FLASH, VIRT_MEM, @@ -149,6 +155,29 @@ static const int a15irqmap[] = { [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ }; +static AcpiMadtInfo madt_info = { + (MemMap *)&a15memmap[VIRT_GIC_CPU], + (MemMap *)&a15memmap[VIRT_GIC_DIST] +}; + +static AcpiDsdtInfo dsdt_info = { + (MemMap *)&a15memmap[VIRT_UART], + .uart_irq = &a15irqmap[VIRT_UART], + (MemMap *)&a15memmap[VIRT_MMIO], + .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], + .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, + (MemMap *)&a15memmap[VIRT_RTC], + .rtc_irq = &a15irqmap[VIRT_RTC], + (MemMap *)&a15memmap[VIRT_FLASH], +}; + +static AcpiGtdtInfo gtdt_info = { + ARCH_TIMER_VIRT_IRQ + 16, + ARCH_TIMER_S_EL1_IRQ + 16, + ARCH_TIMER_NS_EL1_IRQ + 16, + ARCH_TIMER_NS_EL2_IRQ + 16 +}; + static VirtBoardInfo machines[] = { { .cpu_model = "cortex-a15", @@ -289,10 +318,10 @@ static void fdt_add_timer_nodes(const VirtBoardInfo *vbi) "arm,armv7-timer"); } qemu_fdt_setprop_cells(vbi->fdt, "/timer", "interrupts", - GIC_FDT_IRQ_TYPE_PPI, 13, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 14, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 11, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 10, irqflags); + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_S_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_VIRT_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL2_IRQ, irqflags); } static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) @@ -633,8 +662,8 @@ static void create_pcie_irq_map(const VirtBoardInfo *vbi, uint32_t gic_phandle, 0x7 /* PCI irq */); } -static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, - uint32_t gic_phandle) +static AcpiPcieInfo *create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, + uint32_t gic_phandle) { hwaddr base = vbi->memmap[VIRT_PCIE].base; hwaddr size = vbi->memmap[VIRT_PCIE].size; @@ -654,6 +683,7 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, DeviceState *dev; char *nodename; int i; + AcpiPcieInfo *pcie_info; base_ecam = QEMU_ALIGN_DOWN(end - size_ecam, size_ecam); base_ioport = QEMU_ALIGN_DOWN(base_ecam - size_ioport, size_ioport); @@ -709,6 +739,18 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, create_pcie_irq_map(vbi, gic_phandle, irq, nodename); g_free(nodename); + + pcie_info = g_malloc0(sizeof *pcie_info); + pcie_info->pcie_mmio.addr = base_mmio; + pcie_info->pcie_mmio.size = size_mmio; + pcie_info->pcie_ioport.addr = base_ioport; + pcie_info->pcie_ioport.size = size_ioport; + pcie_info->pcie_ecam.addr = base_ecam; + pcie_info->pcie_ecam.size = size_ecam; + pcie_info->nr_pcie_buses = nr_pcie_buses; + pcie_info->pcie_irq = &a15irqmap[VIRT_PCIE]; + + return pcie_info; } static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) @@ -719,6 +761,15 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) return board->fdt; } +static +void virt_guest_info_machine_done(Notifier *notifier, void *data) +{ + VirtGuestInfoState *guest_info_state = container_of(notifier, + VirtGuestInfoState, + machine_done); + virt_acpi_setup(&guest_info_state->info); +} + static void machvirt_init(MachineState *machine) { VirtMachineState *vms = VIRT_MACHINE(machine); @@ -728,6 +779,8 @@ static void machvirt_init(MachineState *machine) MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + VirtGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); + VirtGuestInfo *guest_info = &guest_info_state->info; uint32_t gic_phandle; char **cpustr; @@ -812,7 +865,7 @@ static void machvirt_init(MachineState *machine) create_rtc(vbi, pic); - create_pcie(vbi, pic, gic_phandle); + guest_info->pcie_info = create_pcie(vbi, pic, gic_phandle); /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If @@ -821,6 +874,7 @@ static void machvirt_init(MachineState *machine) create_virtio_devices(vbi, pic); create_fw_cfg(vbi); + rom_set_fw(fw_cfg_find()); vbi->bootinfo.ram_size = machine->ram_size; vbi->bootinfo.kernel_filename = machine->kernel_filename; @@ -831,6 +885,16 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; vbi->bootinfo.firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0); + + guest_info->smp_cpus = smp_cpus; + guest_info->max_cpus = max_cpus; + guest_info->fw_cfg = fw_cfg_find(); + guest_info->madt_info = &madt_info; + guest_info->dsdt_info = &dsdt_info; + guest_info->gtdt_info = >dt_info; + guest_info_state->machine_done.notify = virt_guest_info_machine_done; + qemu_add_machine_init_done_notifier(&guest_info_state->machine_done); + arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 648278e..c94e6e6 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,6 +1,6 @@ common-obj-y += core.o smbus.o smbus_eeprom.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o -common-obj-$(CONFIG_ACPI) += smbus_ich9.o +common-obj-$(CONFIG_ACPI_CORE) += smbus_ich9.o common-obj-$(CONFIG_APM) += pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o