From patchwork Thu Oct 29 14:27:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 537867 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 D556F140549 for ; Fri, 30 Oct 2015 01:29:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro_org.20150623.gappssmtp.com header.i=@linaro_org.20150623.gappssmtp.com header.b=HY9LPvW+; dkim-atps=neutral Received: from localhost ([::1]:44389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZroCp-0000Sl-Na for incoming@patchwork.ozlabs.org; Thu, 29 Oct 2015 10:29:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZroCG-00082R-IP for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZroCA-0000EQ-BU for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:28:56 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:33455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZroCA-0000EM-4M for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:28:50 -0400 Received: by padhy1 with SMTP id hy1so36656904pad.0 for ; Thu, 29 Oct 2015 07:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fpTHSNWhbohgSOSuRyQGPqHEt9FeZ3Xa5x3eiuw1XB0=; b=HY9LPvW+hT0ArjVTrqi3Aiizo5yXTvILmGe9q8Dr+LBqMXApk2FyQ/+tPuAlvm+5aA YeGPwsIDAY+/tkYhZ7WcgzsKYJSFez89cd5bXxcuSXsJvHDM1n8N7o0oiLiO58gs0jv3 5RyolME+93gfXsP5ixzNwj5UmUs8tgFIl0GO/TWIPUdk4w79PI6bD9xQNMEkJ3S9F9Ul rl7fmWaJnTJNU28M7FrOiLjK9SZSXvxNUY3TLp+wDUi3+1Jm+9WGI3GOkmdT27LReBr8 uaM4rHAVNfQa2GJB7H4X43kUqSySoCfEF3DlyMzb5uKu2iFygH5gntTjAH2rJ4mtp/YW cxaA== 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=fpTHSNWhbohgSOSuRyQGPqHEt9FeZ3Xa5x3eiuw1XB0=; b=iCXO2f1UpeOselQlpJXECZO/7rJRcgBq6aj+xzPmgWVlG0LdmOW8HuQNXI7Vx2mTK/ aEfTfsGQARvbRwyxRocI0sRv2kV5Cu4PS2HC7BaaHt1Bk2R4vMptwp1BOq1Ni9ZP2MOO bNUc+2wgjPICUdpagkyC70eYIFGmX7No0ywtuzieUmXwpOLjN+404ZZPRpWliZzecGb1 GcGM+rJFj6fOxDqjOHYhbBpYwjzKmr7M0AaUQYmmw77oYKdzQf7WL4CKUkpCtrZVh0kV 8PtT4Lan0bv4Z9JxqzCiNyYcL3WrMB7ALc/N2XkqQCQ2jAWCY+kLFVGGrcHnzAv753Xc TKPg== X-Gm-Message-State: ALoCoQkX7wvTnh1ac1qEKKqIUlNdw5+bpwwvedQBIkNlRpg0JDa33eM6pp/WX9GSTORjbgIb5jbU X-Received: by 10.68.203.73 with SMTP id ko9mr2191521pbc.139.1446128929652; Thu, 29 Oct 2015 07:28:49 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by smtp.gmail.com with ESMTPSA id a5sm1805986pbu.55.2015.10.29.07.28.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Oct 2015 07:28:48 -0700 (PDT) From: Shannon Zhao To: qemu-devel@nongnu.org, peter.maydell@linaro.org, mst@redhat.com, imammedo@redhat.com Date: Thu, 29 Oct 2015 22:27:28 +0800 Message-Id: <1446128855-26637-2-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1446128855-26637-1-git-send-email-shannon.zhao@linaro.org> References: <1446128855-26637-1-git-send-email-shannon.zhao@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22f Cc: zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v2 1/8] 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 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 Reviewed-by: Wei Huang --- 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 77d9267..5c505a4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -120,6 +120,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x00000018 }, + [VIRT_GPIO] = { 0x09030000, 0x00001000 }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, @@ -135,6 +136,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 */ [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ [VIRT_PLATFORM_BUS] = 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */ @@ -538,6 +540,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\0arm,primecell"; + + 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; @@ -1041,6 +1069,8 @@ static void machvirt_init(MachineState *machine) create_pcie(vbi, pic, vms->highmem); + create_gpio(vbi, pic); + /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If * no backend is created the transport will just sit harmlessly idle. diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index f464586..925faa7 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -59,6 +59,7 @@ enum { VIRT_PCIE_ECAM, VIRT_PLATFORM_BUS, VIRT_PCIE_MMIO_HIGH, + VIRT_GPIO, }; typedef struct MemMapEntry {