From patchwork Tue Feb 17 10:10:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 440545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6B2E31402A0 for ; Tue, 17 Feb 2015 21:12:09 +1100 (AEDT) Received: from localhost ([::1]:44542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNf8R-00080g-8Q for incoming@patchwork.ozlabs.org; Tue, 17 Feb 2015 05:12:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNf7j-0006nL-Ri for qemu-devel@nongnu.org; Tue, 17 Feb 2015 05:11:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNf7d-0000lf-C8 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 05:11:23 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:19434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNf7c-0000kp-PF for qemu-devel@nongnu.org; Tue, 17 Feb 2015 05:11:17 -0500 Received: from 172.24.2.119 (EHLO szxeml426-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BCA97227; Tue, 17 Feb 2015 18:11:04 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml426-hub.china.huawei.com (10.82.67.181) with Microsoft SMTP Server id 14.3.158.1; Tue, 17 Feb 2015 18:10:52 +0800 From: Shannon Zhao To: , , , , , , , , , Date: Tue, 17 Feb 2015 18:10:01 +0800 Message-ID: <1424167806-8372-3-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1424167806-8372-1-git-send-email-zhaoshenglong@huawei.com> References: <1424167806-8372-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.54E313B8.00AE, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 6209b85d111bf79747e1ec903f454a68 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: wanghaibin.wang@huawei.com, hangaohuai@huawei.com, peter.huangpeng@huawei.com Subject: [Qemu-devel] [RFC PATCH 2/7] hw/arm/virt-acpi-build: Add GPIO controller in ACPI DSDT table 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add GPIO controller in ACPI DSDT table. It can be used for device hotplug. Signed-off-by: Shannon Zhao --- hw/arm/virt-acpi-build.c | 21 +++++++++++++++++++++ hw/arm/virt.c | 2 ++ include/hw/arm/virt-acpi-build.h | 2 ++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index bfbddbe..4f26551 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -176,6 +176,26 @@ static void acpi_dsdt_add_virtio(Aml *scope, const hwaddr *mmio_addrs, } } +static void acpi_dsdt_add_gpio(Aml *scope, const hwaddr *gpio_addrs, + const int *gpio_irq) +{ + Aml *dev, *crs; + + dev = aml_device("GPO0"); + aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0009"))); + aml_append(dev, aml_name_decl("_ADR", aml_int(0))); + aml_append(dev, aml_name_decl("_UID", aml_int(0))); + + crs = aml_resource_template(); + aml_append(crs, + aml_memory32_fixed(gpio_addrs[0], gpio_addrs[1], 0x01)); + aml_append(crs, + aml_interrupt(0x01, *gpio_irq + 32)); + aml_append(dev, aml_name_decl("_CRS", crs)); + + aml_append(scope, dev); +} + /* RSDP */ static GArray * build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) @@ -343,6 +363,7 @@ build_dsdt(Aml *table_data, GArray *linker, VirtGuestInfo *guest_info) acpi_dsdt_add_flash(scope, info->flash_addr); acpi_dsdt_add_virtio(scope, info->virtio_mmio_addr, info->virtio_mmio_irq, info->virtio_mmio_num); + acpi_dsdt_add_gpio(scope, info->gpio_addr, info->gpio_irq); aml_append(dsdt, scope); aml_append(table_data, dsdt); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 43c0260..f689bc3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -159,6 +159,8 @@ static const struct acpi_dsdt_info dsdt_info = { .virtio_mmio_addr = &a15memmap[VIRT_MMIO].base, .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, + .gpio_addr = &a15memmap[VIRT_GPIO].base, + .gpio_irq = &a15irqmap[VIRT_GPIO], .rtc_addr = &a15memmap[VIRT_RTC].base, .rtc_irq = &a15irqmap[VIRT_RTC], .flash_addr = &a15memmap[VIRT_FLASH].base, diff --git a/include/hw/arm/virt-acpi-build.h b/include/hw/arm/virt-acpi-build.h index 451edc9..de8d4c6 100644 --- a/include/hw/arm/virt-acpi-build.h +++ b/include/hw/arm/virt-acpi-build.h @@ -47,6 +47,8 @@ struct acpi_dsdt_info { const hwaddr *virtio_mmio_addr; const int *virtio_mmio_irq; int virtio_mmio_num; + const hwaddr *gpio_addr; + const int *gpio_irq; const hwaddr *rtc_addr; const int *rtc_irq; const hwaddr *flash_addr;