From patchwork Fri Apr 3 10:03:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 46757 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 5C863216D1 for ; Fri, 3 Apr 2015 10:15:28 +0000 (UTC) Received: by labtp8 with SMTP id tp8sf23465218lab.2 for ; Fri, 03 Apr 2015 03:15: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 :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=DhnpBJIXhW+EtgtDdZNyn3ngbYVNhb34W5AE2HeRGs0=; b=Y3ngQu/uKQfSI6Xi2L+TKpXz9gvwClKZOD16t0+Wgjxd4iGRK4dH8ETp4jc7FvLO4n Ji9siSaV90hNJspv8a3/GXNryU56Bo7HzFE0bSvgWgcZz5i7M/gIQS5LaQAmSvbGhflj +xKPJ6J9Mq2eKrZqNicvwLG0zWbUKQAAYg0tI3BREWxgsihjdna84QQfi8vDAZltO9ck O8ZuV4qOKI33kUORas5yHClkMGstEfHttz8wFvD0kefVS81O/n420SSTDvAq6IhqysjR G0EqVjpRiOH2MHJ+kuGvwSMN96V3iQc7x9gergkbKn2NUTH4wLdNPrHcyrogbYLLY4lc LDQw== X-Gm-Message-State: ALoCoQlpyPWoSvxTWrCZ3S2WAgQKRIfu2bjNMOZ1wB/cQEgayBvTlpWj56sanbS3YUc0MEcRFFQu X-Received: by 10.180.81.134 with SMTP id a6mr554493wiy.1.1428056127361; Fri, 03 Apr 2015 03:15:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.8 with SMTP id j8ls328339lae.7.gmail; Fri, 03 Apr 2015 03:15:27 -0700 (PDT) X-Received: by 10.112.162.232 with SMTP id yd8mr1518914lbb.41.1428056127221; Fri, 03 Apr 2015 03:15:27 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id b2si6360790lbi.36.2015.04.03.03.15.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Apr 2015 03:15:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lagv1 with SMTP id v1so1272463lag.3 for ; Fri, 03 Apr 2015 03:15:27 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr1575668lab.106.1428056127076; Fri, 03 Apr 2015 03:15:27 -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.57.201 with SMTP id k9csp1862174lbq; Fri, 3 Apr 2015 03:15:26 -0700 (PDT) X-Received: by 10.55.22.168 with SMTP id 40mr2850547qkw.101.1428056125808; Fri, 03 Apr 2015 03:15:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t5si7693208qgd.84.2015.04.03.03.15.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 03 Apr 2015 03:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:33372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdydI-0000JG-SD for patch@linaro.org; Fri, 03 Apr 2015 06:15:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdyXP-0007K3-Fk for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdyXO-000360-6j for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:09:19 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:9458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdyXN-0002nb-KO for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:09:18 -0400 Received: from 172.24.2.119 (EHLO szxeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CJI43138; Fri, 03 Apr 2015 18:05:44 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 18:05:35 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Fri, 3 Apr 2015 18:03:32 +0800 Message-ID: <1428055432-12120-1-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 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 v4 00/20] Generate ACPI v5.1 tables and expose it to guest over fw_cfg on ARM 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.215.52 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 This patch series generate six ACPI v5.1 tables for machine virt on ARM. The set of generated tables are: - RSDP - RSDT - MADT - GTDT - FADT - DSDT - MCFG (For PCIe host bridge) These tables are created dynamically using the function of aml-build.c, taking into account the needed information passed from the virt machine model. When the generation is finalized, it use fw_cfg to expose the tables to guest. You can fetch this from following repo: http://git.linaro.org/people/shannon.zhao/qemu.git ACPI_ARM_v4 And this patchset refers to Alexander Spyridakis's patches which are sent to qemu-devel mailing list before. http://lists.gnu.org/archive/html/qemu-devel/2014-10/msg03987.html Thanks to Laszlo's work on UEFI (ArmVirtualizationQemu) supporting downloading ACPI tables over fw_cfg, we now can use ACPI in VM. I have done following vm startup test: xp, windows2008, sles11 on X86 Fedora Linux kernel on ARM64 Note: As upstream kernel doesn't support ACPI PCI host bridge on ARM64, so I use the Fedora Linux kernel from following address: https://git.fedorahosted.org/cgit/kernel-arm64.git/log/?h=devel But maybe this has a bug which cause unsuccessfully initializing BAR, therefore virtio-pci can't work. I apply the following patch and the virtio-pci, e1000 work well. changes since v3: * rebase on upstream qemu * fix _HID of CPU (Heyi Guo) * Add PCIe host bridge changes since v2: * rebase on Igor Mammedov's new branch ASL_API_v3 * use rsdt instead of xsdt according to Igor Mammedov's suggestion changes since v1: * fix bug found by Laszlo * move common helpers into dedictated file and change generating table order according to Igor's comments * fix copyright and function name according to Michael's comments Shannon Zhao (20): hw/i386: Move ACPI header definitions in an arch-independent location hw/i386/acpi-build: move generic acpi building helpers into dedictated file hw/arm/virt-acpi-build: Basic framework for building ACPI tables on ARM hw/acpi/aml-build: Add aml_memory32_fixed() term hw/acpi/aml-build: Add aml_interrupt() term hw/arm/virt-acpi-build: Generation of DSDT table for virt devices hw/arm/virt-acpi-build: Generate FADT table and update ACPI headers hw/arm/virt-acpi-build: Generate MADT table hw/arm/virt-acpi-build: Generate GTDT table hw/arm/virt-acpi-build: Generate RSDT table hw/arm/virt-acpi-build: Generate RSDP table hw/arm/virt-acpi-build: Add PCIe info and generate MCFG table hw/acpi/aml-build: Add ToUUID macro hw/acpi/aml-build: Add aml_or() term hw/acpi/aml-build: Add aml_not() term hw/acpi/aml-build: Add aml_else() term hw/acpi/aml-build: Add aml_create_dword_field() term hw/acpi/aml-build: Add aml_dword_io() term hw/arm/virt-acpi-build: Add PCIe controller in ACPI DSDT table hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables 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/acpi/aml-build.c | 189 +++++++++- hw/arm/Makefile.objs | 1 + hw/arm/virt-acpi-build.c | 678 +++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 78 +++- hw/i2c/Makefile.objs | 2 +- hw/i386/acpi-build.c | 81 +---- hw/i386/acpi-defs.h | 368 ------------------- include/hw/acpi/acpi-defs.h | 479 +++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 45 ++- include/hw/arm/virt-acpi-build.h | 79 ++++ tests/bios-tables-test.c | 2 +- 19 files changed, 1564 insertions(+), 462 deletions(-) create mode 100644 hw/arm/virt-acpi-build.c delete mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/acpi/acpi-defs.h create mode 100644 include/hw/arm/virt-acpi-build.h diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 8456e72..32f8869 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -240,7 +240,7 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data) if (pci_remap_iospace(res, start) < 0) return AE_OK; - info->res_offset[info->res_num] = port - addr.address.minimum; + info->res_offset[info->res_num] = port; } else info->res_offset[info->res_num] = addr.address.translation_offset;