From patchwork Tue May 12 04:24:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 471120 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 E38E11400A0 for ; Tue, 12 May 2015 14:27:15 +1000 (AEST) Received: from localhost ([::1]:40791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1mj-0001Rk-Pz for incoming@patchwork.ozlabs.org; Tue, 12 May 2015 00:27:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1kG-0005PR-JH for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys1kC-0006rB-3Z for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:40 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:36457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1kB-0006r4-Rr for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:35 -0400 Received: by pdea3 with SMTP id a3so168591993pde.3 for ; Mon, 11 May 2015 21:24:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LiplHPEVITky0RwzJMURmiU4g5yBUWzTvFWgLBe7kCg=; b=QinhoFrH1lSzhsWiRMCSbI3iSYeRaOckD8PYoGXgW0rIOmvWd3fcvLg0wjaDkg35Up R4UR/NSQjO/XlJXEoMalKxRiVcgS2aOVGTfA6+4hwhTsJyBOdiiCKBdetV+jRe/PnswO dJy7Uj3FcEcZzPGBg0+ij9eJi68/jhcVT/MBdAGNmQYUtKEPeVtWYdlq1reCVF2pAJbu jT9xIgI5aAGUg8q+b3R+v+Bdu1dmURZnxV4tS3rh27stAWQuugu6InXc3fTkRZ4/6nVp oJ6wHHg1yn/awXjEaN7xnv9HZXrK6Piqk4dcenU/f1MWuKXPH/TAhpQSRjXLtCnBXZJo P3mA== X-Gm-Message-State: ALoCoQls224PhjwKVk2iJDCAV7GAj4TUugtYA9f80LOkw+FND+c2SGusqvDKsRmv7/CCbFNlpuwt X-Received: by 10.70.130.43 with SMTP id ob11mr24898778pdb.35.1431404675268; Mon, 11 May 2015 21:24:35 -0700 (PDT) Received: from localhost ([180.150.141.243]) by mx.google.com with ESMTPSA id ry2sm14579149pbb.83.2015.05.11.21.24.33 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 May 2015 21:24:34 -0700 (PDT) From: shannon.zhao@linaro.org To: qemu-devel@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com, pbonzini@redhat.com, wei@redhat.com, arnd@arndb.de, christoffer.dall@linaro.org Date: Tue, 12 May 2015 12:24:11 +0800 Message-Id: <1431404656-7180-3-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1431404656-7180-1-git-send-email-shannon.zhao@linaro.org> References: <1431404656-7180-1-git-send-email-shannon.zhao@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.179 Cc: hangaohuai@huawei.com, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [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 From: Shannon Zhao Add GPIO controller in ACPI DSDT table. It can be used for gpio event. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/virt-acpi-build.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index b3f27d0..e505c16 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -301,6 +301,24 @@ static void acpi_dsdt_add_pci(Aml *scope, VirtAcpiPcieInfo *info, int pcie_irq) aml_append(scope, dev); } +static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap, + int gpio_irq) +{ + Aml *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))); + + Aml *crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(gpio_memmap->base, + gpio_memmap->size, aml_ReadWrite)); + aml_append(crs, + aml_interrupt(aml_consumer, aml_edge, aml_active_high, + aml_exclusive, aml_not_wake_capable, 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) @@ -456,6 +474,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO], irqmap[VIRT_MMIO], NUM_VIRTIO_TRANSPORTS); acpi_dsdt_add_pci(scope, guest_info->pcie_info, irqmap[VIRT_PCIE]); + acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO], irqmap[VIRT_GPIO]); aml_append(dsdt, scope);