[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/25] ARM: Virt: Add a GPIO controller
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 08/25] ARM: Virt: Add a GPIO controller |
Date: |
Thu, 17 Dec 2015 11:50:03 +0000 |
From: Shannon Zhao <address@hidden>
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 <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Wei Huang <address@hidden>
Tested-by: Wei Huang <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
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 9c6792c..7977e3c 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("/address@hidden" 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 {
--
1.9.1
- [Qemu-devel] [PULL 19/25] target-arm: kvm - add support for HW assisted debug, (continued)
- [Qemu-devel] [PULL 19/25] target-arm: kvm - add support for HW assisted debug, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 21/25] tests/guest-debug: introduce basic gdbstub tests, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 18/25] target-arm: kvm - support for single step, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 10/25] ARM: ACPI: Add power button device in ACPI DSDT table, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 15/25] ARM: Virt: Add gpio-keys node for Poweroff using DT, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 16/25] target-arm: kvm64 - introduce kvm_arm_init_debug(), Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 25/25] i.MX: Add an i.MX25 specific CCM class/instance, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 14/25] ARM: Virt: Add QEMU powerdown notifier and hook it to GPIO Pin 3, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 07/25] acpi: extend aml_interrupt() to support multiple irqs, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 12/25] ACPI: Add aml_gpio_int() wrapper for GPIO Interrupt Connection, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 08/25] ARM: Virt: Add a GPIO controller,
Peter Maydell <=
- [Qemu-devel] [PULL 03/25] arm: soc-dma: use hwaddr instead of target_ulong in printf, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 01/25] i.MX: add support for lower and upper interrupt in GPIO., Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 04/25] target-arm: raise exception on misaligned LDREX operands, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 09/25] ARM: ACPI: Add GPIO controller in ACPI DSDT table, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 13/25] ARM: ACPI: Add _E03 for Power Button, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 11/25] ACPI: Add GPIO Connection Descriptor, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 06/25] acpi: support serialized method, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 02/25] arm: explicitly mark device loads as little-endian, Peter Maydell, 2015/12/17
- Re: [Qemu-devel] [PULL 00/25] target-arm queue, Peter Maydell, 2015/12/17