From patchwork Tue May 12 04:24:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 471117 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 8ECC1140187 for ; Tue, 12 May 2015 14:26:09 +1000 (AEST) Received: from localhost ([::1]:40781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1lf-0007nI-EY for incoming@patchwork.ozlabs.org; Tue, 12 May 2015 00:26:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1kA-0005Hr-Cu for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys1k6-0006oL-BN for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:34 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys1k6-0006nu-5z for qemu-devel@nongnu.org; Tue, 12 May 2015 00:24:30 -0400 Received: by pacyx8 with SMTP id yx8so130621465pac.1 for ; Mon, 11 May 2015 21:24:29 -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=tyAe6IsohEAVqMNfZfpmnXim9Q0MwBhWL7Jp7JWIT6I=; b=bWJq6tDu73TH6k5pqNUwbbSqpv8bzL32Ggi/tCJK+P0ZIxDGXbN0VLlvXmZ+pfrE57 z+FItBdK86JDkacwV2BF14sVlnJgBNl93L6vPFqNTun2qJMBidPYMcDPu9TU7PNwuAY9 XX9xMQEGq+cenv9ALLJLo0qqBshrXPXz9LlNSRShsMwx+Dl6KWIf94uE2VUEzQ1r/97g HLJLhSzQmCL5WwrF7AEJz8pVLo+j786Ez4uCil//tXzEsYz7R+JyF7y9HtT0B/Z/LDQC il2I6ZivFQWWtnUA8alb+OujjKP5lxvVreNPh7jtsGIkSAuxwzEUAnEWIuMK3NurU2Dn jJOw== X-Gm-Message-State: ALoCoQlAXM6Ga46sjzMCsvYxCYa6QaR/M8IWFK/d/u/EmRuf9Hnsdow3a5FeFXXJUh3cTr6EFRNF X-Received: by 10.70.130.198 with SMTP id og6mr24475965pdb.153.1431404669630; Mon, 11 May 2015 21:24:29 -0700 (PDT) Received: from localhost ([180.150.141.243]) by mx.google.com with ESMTPSA id ez1sm14604978pbd.0.2015.05.11.21.24.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 May 2015 21:24:28 -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:10 +0800 Message-Id: <1431404656-7180-2-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.220.49 Cc: hangaohuai@huawei.com, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH 1/7] hw/arm/virt: Add a GPIO controller 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 ACPI 5.0 supports GPIO-signaled ACPI Events. This can be used for powerdown, hotplug evnets. Add a GPIO controller in machine virt, to support powerdown, maybe can be used for cpu hotplug. And here we use pl061. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/virt.c | 30 ++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 31 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3951326..3511903 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -111,6 +111,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, + [VIRT_GPIO] = { 0x09030000, 0x00001000 }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* @@ -128,6 +129,7 @@ static const int a15irqmap[] = { [VIRT_UART] = 1, [VIRT_RTC] = 2, [VIRT_PCIE] = 3, /* ... to 6 */ + [VIRT_GPIO] = 7, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ }; @@ -430,6 +432,32 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) g_free(nodename); } +static void create_gpio(const VirtBoardInfo *vbi, qemu_irq *pic) +{ + char *nodename; + hwaddr base = vbi->memmap[VIRT_GPIO].base; + hwaddr size = vbi->memmap[VIRT_GPIO].size; + int irq = vbi->irqmap[VIRT_GPIO]; + const char compat[] = "arm,pl061"; + + sysbus_create_simple("pl061", base, pic[irq]); + + nodename = g_strdup_printf("/pl061@%" PRIx64, base); + qemu_fdt_add_subnode(vbi->fdt, nodename); + qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg", + 2, base, 2, size); + qemu_fdt_setprop(vbi->fdt, nodename, "compatible", compat, sizeof(compat)); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "#gpio-cells", 2); + qemu_fdt_setprop(vbi->fdt, nodename, "gpio-controller", NULL, 0); + qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); + qemu_fdt_setprop_cell(vbi->fdt, nodename, "clocks", vbi->clock_phandle); + qemu_fdt_setprop_string(vbi->fdt, nodename, "clock-names", "apb_pclk"); + + g_free(nodename); +} + static void create_virtio_devices(const VirtBoardInfo *vbi, qemu_irq *pic) { int i; @@ -821,6 +849,8 @@ static void machvirt_init(MachineState *machine) create_rtc(vbi, pic); + create_gpio(vbi, pic); + guest_info->pcie_info = create_pcie(vbi, pic, gic_phandle); /* Create mmio transports, so the user can create virtio backends diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index ba7fe0b..31b7eba 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -50,6 +50,7 @@ enum { VIRT_RTC, VIRT_FW_CFG, VIRT_PCIE, + VIRT_GPIO, }; typedef struct MemMapEntry {